mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-20 06:35:50 +02:00
Code Issues Wiki Activity

[244807] System view does not handle restore from cache

Browse source
This commit is contained in:
David McKnight 2008-08-22 13:00:36 +00:00
parent 495a19fd05
commit 7b7d173c64
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java
View file

@ -32,6 +32,7 @@
* David McKnight (IBM) - [225747] [dstore] Trying to connect to an "Offline" system throws an NPE * David McKnight (IBM) - [225747] [dstore] Trying to connect to an "Offline" system throws an NPE
* David Dykstal (IBM) - [216858] Need the ability to Import/Export RSE connections for sharing * David Dykstal (IBM) - [216858] Need the ability to Import/Export RSE connections for sharing
* Kevin Doyle (IBM) - [186769] Enable Contributions to Drop Down menu of Remote Systems view -> Preferences * Kevin Doyle (IBM) - [186769] Enable Contributions to Drop Down menu of Remote Systems view -> Preferences
* David McKnight (IBM) - [244807] System view does not handle restore from cache
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.internal.ui.view; package org.eclipse.rse.internal.ui.view;
@ -1598,10 +1599,14 @@ public class SystemViewPart
} }
else if (object instanceof ISystemFilterReference) else if (object instanceof ISystemFilterReference)
{ {
ISystemFilterReference fref = (ISystemFilterReference)object; ISystemFilterReference fref = (ISystemFilterReference)object;
ISubSystem ss = fref.getSubSystem(); ISubSystem ss = fref.getSubSystem();
boolean isRestoringCache = ss.getCacheManager() != null && ss.getCacheManager().isRestoreFromMemento();
if (!ss.isOffline()){ if (!ss.isOffline()){
if (!ss.isConnected()){ if (!ss.isConnected() && !isRestoringCache){
try try
{ {
ss.connect(monitor, false); ss.connect(monitor, false);
@ -1610,7 +1615,7 @@ public class SystemViewPart
return Status.CANCEL_STATUS; return Status.CANCEL_STATUS;
} }
} }
if (ss.isConnected()) if (ss.isConnected() || isRestoringCache)
{ {
// get the adapter // get the adapter
ISystemViewElementAdapter adapter = (ISystemViewElementAdapter)((IAdaptable)object).getAdapter(ISystemViewElementAdapter.class); ISystemViewElementAdapter adapter = (ISystemViewElementAdapter)((IAdaptable)object).getAdapter(ISystemViewElementAdapter.class);