Attachment #110671 for bug #244807




 * 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)        - [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;

	 */
	public void checkIsConnected(IProgressMonitor monitor) throws SystemMessageException
	{
		// for 244270, don't connect when offline
		// or when restoring from memento
		if (!isConnected() && !isOffline()  && (!(getCacheManager() != null) && !getCacheManager().isRestoreFromMemento())) 
		{
			try
			{

		// for bug 233435, implicit connect if the connection is not connected
		checkIsConnected(monitor);

		if (isConnected() || isOffline() || (getCacheManager() != null && getCacheManager().isRestoreFromMemento()))
		{
			if (!supportsConnecting && !_isInitialized) {
				// Lazy Loading: Load adapters (e.g. Local Subsystem)

			SystemBasePlugin.logInfo("Filter strings are null"); //$NON-NLS-1$
			return null;
		}
		if (isConnected() || isOffline() || (getCacheManager() != null && getCacheManager().isRestoreFromMemento()))
		{
			if (!supportsConnecting && !_isInitialized) {
				// Lazy Loading: Load adapters (e.g. Local Subsystem)

			checkIsConnected(monitor);
		}
		
		if (isConnected() || isOffline() || (getCacheManager() != null && getCacheManager().isRestoreFromMemento()))
		{
			if (!supportsConnecting && !_isInitialized) {
				// Lazy Loading: Load adapters (e.g. Local Subsystem)

			doConnection = true;	// this gets handled later when it comes time to connect
			return true;
		}
		else if (supportsCaching() && getCacheManager().isRestoreFromMemento())
		{
			doConnection = true;	// this gets handled later when it comes time to connect
			return true;
		}

		try
		{

Return to bug 244807

Lines 43-48 Link Here

(-)subsystems/org/eclipse/rse/core/subsystems/SubSystem.java (-10 / +7 lines)
43	* David McKnight (IBM) - [238609] Substitution value missing for disconnect failed message	43	* David McKnight (IBM) - [238609] Substitution value missing for disconnect failed message
44	* David McKnight (IBM) - [237970] Subsystem.connect( ) fails for substituting host name when isOffline( ) is true	44	* David McKnight (IBM) - [237970] Subsystem.connect( ) fails for substituting host name when isOffline( ) is true
45	* David McKnight (IBM) - [244270] Explicit check for isOffline and just returning block implementing a cache for Work Offline	45	* David McKnight (IBM) - [244270] Explicit check for isOffline and just returning block implementing a cache for Work Offline
		46	* Don Yantzi (IBM) - [244807] Delay connecting if resolving filters while restoring from cache
46	********************************************************************************/	47	********************************************************************************/
47		48
48	package org.eclipse.rse.core.subsystems;	49	package org.eclipse.rse.core.subsystems;
Lines 552-559 Link Here
552	*/	553	*/
553	public void checkIsConnected(IProgressMonitor monitor) throws SystemMessageException	554	public void checkIsConnected(IProgressMonitor monitor) throws SystemMessageException
554	{	555	{
555	if (!isConnected() &&	556	// for 244270, don't connect when offline
556	!isOffline()) // for 244270, don't connect when offline	557	// or when restoring from memento
		558	if (!isConnected() && !isOffline() && (!(getCacheManager() != null) && !getCacheManager().isRestoreFromMemento()))
557	{	559	{
558	try	560	try
559	{	561	{
Lines 2195-2201 Link Here
2195	// for bug 233435, implicit connect if the connection is not connected	2197	// for bug 233435, implicit connect if the connection is not connected
2196	checkIsConnected(monitor);	2198	checkIsConnected(monitor);
2197		2199
2198	if (isConnected())	2200	if (isConnected() \|\| isOffline() \|\| (getCacheManager() != null && getCacheManager().isRestoreFromMemento()))
2199	{	2201	{
2200	if (!supportsConnecting && !_isInitialized) {	2202	if (!supportsConnecting && !_isInitialized) {
2201	// Lazy Loading: Load adapters (e.g. Local Subsystem)	2203	// Lazy Loading: Load adapters (e.g. Local Subsystem)
Lines 2239-2245 Link Here
2239	SystemBasePlugin.logInfo("Filter strings are null"); //$NON-NLS-1$	2241	SystemBasePlugin.logInfo("Filter strings are null"); //$NON-NLS-1$
2240	return null;	2242	return null;
2241	}	2243	}
2242	if (isConnected())	2244	if (isConnected() \|\| isOffline() \|\| (getCacheManager() != null && getCacheManager().isRestoreFromMemento()))
2243	{	2245	{
2244	if (!supportsConnecting && !_isInitialized) {	2246	if (!supportsConnecting && !_isInitialized) {
2245	// Lazy Loading: Load adapters (e.g. Local Subsystem)	2247	// Lazy Loading: Load adapters (e.g. Local Subsystem)
Lines 2298-2304 Link Here
2298	checkIsConnected(monitor);	2300	checkIsConnected(monitor);
2299	}	2301	}
2300		2302
2301	if (isConnected())	2303	if (isConnected() \|\| isOffline() \|\| (getCacheManager() != null && getCacheManager().isRestoreFromMemento()))
2302	{	2304	{
2303	if (!supportsConnecting && !_isInitialized) {	2305	if (!supportsConnecting && !_isInitialized) {
2304	// Lazy Loading: Load adapters (e.g. Local Subsystem)	2306	// Lazy Loading: Load adapters (e.g. Local Subsystem)
Lines 2530-2540 Link Here
2530	doConnection = true; // this gets handled later when it comes time to connect	2532	doConnection = true; // this gets handled later when it comes time to connect
2531	return true;	2533	return true;
2532	}	2534	}
2533	else if (supportsCaching() && getCacheManager().isRestoreFromMemento())
2534	{
2535	doConnection = true; // this gets handled later when it comes time to connect
2536	return true;
2537	}
2538		2535
2539	try	2536	try
2540	{	2537	{