mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-15 21:15:23 +02:00
Code Issues Wiki Activity

[244807] Delay connecting if resolving filters while restoring from cache

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

17
rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java
View file

@ -43,6 +43,7 @@
* David McKnight (IBM) - [238609] Substitution value missing for disconnect failed message * David McKnight (IBM) - [238609] Substitution value missing for disconnect failed message
* David McKnight (IBM) - [237970] Subsystem.connect( ) fails for substituting host name when isOffline( ) is true * David McKnight (IBM) - [237970] Subsystem.connect( ) fails for substituting host name when isOffline( ) is true
* David McKnight (IBM) - [244270] Explicit check for isOffline and just returning block implementing a cache for Work Offline * David McKnight (IBM) - [244270] Explicit check for isOffline and just returning block implementing a cache for Work Offline
* Don Yantzi (IBM) - [244807] Delay connecting if resolving filters while restoring from cache
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.core.subsystems; package org.eclipse.rse.core.subsystems;
@ -552,8 +553,9 @@ implements IAdaptable, ISubSystem, ISystemFilterPoolReferenceManagerProvider
*/ */
public void checkIsConnected(IProgressMonitor monitor) throws SystemMessageException public void checkIsConnected(IProgressMonitor monitor) throws SystemMessageException
{ {
if (!isConnected() && // for 244270, don't connect when offline
!isOffline()) // for 244270, don't connect when offline // or when restoring from memento
if (!isConnected() && !isOffline() && (!(getCacheManager() != null) && !getCacheManager().isRestoreFromMemento()))
{ {
try try
{ {
@ -2195,7 +2197,7 @@ implements IAdaptable, ISubSystem, ISystemFilterPoolReferenceManagerProvider
// for bug 233435, implicit connect if the connection is not connected // for bug 233435, implicit connect if the connection is not connected
checkIsConnected(monitor); checkIsConnected(monitor);
if (isConnected()) if (isConnected() || isOffline() || (getCacheManager() != null && getCacheManager().isRestoreFromMemento()))
{ {
if (!supportsConnecting && !_isInitialized) { if (!supportsConnecting && !_isInitialized) {
// Lazy Loading: Load adapters (e.g. Local Subsystem) // Lazy Loading: Load adapters (e.g. Local Subsystem)
@ -2239,7 +2241,7 @@ implements IAdaptable, ISubSystem, ISystemFilterPoolReferenceManagerProvider
SystemBasePlugin.logInfo("Filter strings are null"); //$NON-NLS-1$ SystemBasePlugin.logInfo("Filter strings are null"); //$NON-NLS-1$
return null; return null;
} }
if (isConnected()) if (isConnected() || isOffline() || (getCacheManager() != null && getCacheManager().isRestoreFromMemento()))
{ {
if (!supportsConnecting && !_isInitialized) { if (!supportsConnecting && !_isInitialized) {
// Lazy Loading: Load adapters (e.g. Local Subsystem) // Lazy Loading: Load adapters (e.g. Local Subsystem)
@ -2298,7 +2300,7 @@ implements IAdaptable, ISubSystem, ISystemFilterPoolReferenceManagerProvider
checkIsConnected(monitor); checkIsConnected(monitor);
} }
if (isConnected()) if (isConnected() || isOffline() || (getCacheManager() != null && getCacheManager().isRestoreFromMemento()))
{ {
if (!supportsConnecting && !_isInitialized) { if (!supportsConnecting && !_isInitialized) {
// Lazy Loading: Load adapters (e.g. Local Subsystem) // Lazy Loading: Load adapters (e.g. Local Subsystem)
@ -2530,11 +2532,6 @@ implements IAdaptable, ISubSystem, ISystemFilterPoolReferenceManagerProvider
doConnection = true; // this gets handled later when it comes time to connect doConnection = true; // this gets handled later when it comes time to connect
return true; return true;
} }
else if (supportsCaching() && getCacheManager().isRestoreFromMemento())
{
doConnection = true; // this gets handled later when it comes time to connect
return true;
}
try try
{ {