mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-03 23:25:26 +02:00
[244807] System view does not handle restore from cache
This commit is contained in:
parent
495a19fd05
commit
7b7d173c64
1 changed files with 7 additions and 2 deletions
|
@ -32,6 +32,7 @@
|
|||
* 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
|
||||
* 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;
|
||||
|
@ -1598,10 +1599,14 @@ public class SystemViewPart
|
|||
}
|
||||
else if (object instanceof ISystemFilterReference)
|
||||
{
|
||||
|
||||
ISystemFilterReference fref = (ISystemFilterReference)object;
|
||||
ISubSystem ss = fref.getSubSystem();
|
||||
|
||||
boolean isRestoringCache = ss.getCacheManager() != null && ss.getCacheManager().isRestoreFromMemento();
|
||||
|
||||
if (!ss.isOffline()){
|
||||
if (!ss.isConnected()){
|
||||
if (!ss.isConnected() && !isRestoringCache){
|
||||
try
|
||||
{
|
||||
ss.connect(monitor, false);
|
||||
|
@ -1610,7 +1615,7 @@ public class SystemViewPart
|
|||
return Status.CANCEL_STATUS;
|
||||
}
|
||||
}
|
||||
if (ss.isConnected())
|
||||
if (ss.isConnected() || isRestoringCache)
|
||||
{
|
||||
// get the adapter
|
||||
ISystemViewElementAdapter adapter = (ISystemViewElementAdapter)((IAdaptable)object).getAdapter(ISystemViewElementAdapter.class);
|
||||
|
|
Loading…
Add table
Reference in a new issue