Attachment 116067 Details for Bug 252019 – patch to ensure server launcher properties picked up on restore

[patch] patch to ensure server launcher properties picked up on restore

patch.txt (text/plain), 2.73 KB, created by David McKnight

on 2008-10-24 12:17:49 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: David McKnight

Created: 2008-10-24 12:17:49 EDT

Size: 2.73 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.core
>Index: src/org/eclipse/rse/internal/persistence/dom/RSEDOMImporter.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/dom/RSEDOMImporter.java,v
>retrieving revision 1.24
>diff -u -r1.24 RSEDOMImporter.java
>--- src/org/eclipse/rse/internal/persistence/dom/RSEDOMImporter.java	21 Aug 2008 17:08:03 -0000	1.24
>+++ src/org/eclipse/rse/internal/persistence/dom/RSEDOMImporter.java	24 Oct 2008 16:17:13 -0000
>@@ -23,6 +23,7 @@
>  * David Dykstal (IBM) - [232126] retrieve persisted filter type attribute
>  * David Dykstal (IBM) - [233876] filters lost after restart
>  * David Dykstal (IBM) - [236516] Bug in user code causes failure in RSE initialization
>+ * David McKnight (IBM) - [252019] Backport [dstore] ServerLauncherProperties not restored
>  ********************************************************************************/
> 
> package org.eclipse.rse.internal.persistence.dom;
>@@ -196,15 +197,19 @@
> 		boolean useSSL = getBooleanValue(connectorServiceNode, IRSEDOMConstants.ATTRIBUTE_USE_SSL);
> 		int port = getIntegerValue(connectorServiceNode, IRSEDOMConstants.ATTRIBUTE_PORT);
> 
>+		boolean setServerLauncherProperties = false;
>+		
> 		// first restore subsystems (since right now we need subsystem to get at service
> 		RSEDOMNode[] ssChildren = connectorServiceNode.getChildren(IRSEDOMConstants.TYPE_SUBSYSTEM);
> 		for (int s = 0; s < ssChildren.length; s++) {
> 			RSEDOMNode ssChild = ssChildren[s];
> 			ISubSystem subSystem = restoreSubSystem(host, ssChild);
>-			if (subSystem != null && service == null) {
>+			if (subSystem != null) {
> 				ISubSystemConfiguration subsystemConfiguration = subSystem.getSubSystemConfiguration();
>-				service = subsystemConfiguration.getConnectorService(host);
>-				if (service != null) {
>+				if (service == null){					
>+					service = subsystemConfiguration.getConnectorService(host);
>+				}				
>+				if (service != null && !setServerLauncherProperties) {
> 					if (subsystemConfiguration.supportsServerLaunchProperties(host)) {
> 						IServerLauncherProperties sl = subsystemConfiguration.createServerLauncher(service);
> 						if (sl != null) {
>@@ -215,12 +220,13 @@
> 							if (slChildren != null && slChildren.length > 0) {
> 								serverLauncherPropertiesNode = slChildren[0];
> 								restoreServerLauncher(service, serverLauncherPropertiesNode, sl);
>+								setServerLauncherProperties = true;
> 							}
> 						}
> 					}
> 					service.setPort(port);
> 					service.setIsUsingSSL(useSSL);
>-				}
>+				}				
> 			}
> 			if (service != null && subSystem != null) {
> 				subSystem.setConnectorService(service);

Actions: View | Diff

Attachments on bug 252019: 116067