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

[245198] [dstore] ServerLauncherProperties not restored

Browse source
This commit is contained in:
David McKnight 2008-10-24 16:22:45 +00:00
parent 933dac113c
commit 59bd3f174e
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/internal/persistence/dom/RSEDOMImporter.java
View file

@ -23,6 +23,7 @@
* David Dykstal (IBM) - [232126] retrieve persisted filter type attribute * David Dykstal (IBM) - [232126] retrieve persisted filter type attribute
* David Dykstal (IBM) - [233876] filters lost after restart * David Dykstal (IBM) - [233876] filters lost after restart
* David Dykstal (IBM) - [236516] Bug in user code causes failure in RSE initialization * David Dykstal (IBM) - [236516] Bug in user code causes failure in RSE initialization
* David McKniht (IBM) - [245198] [dstore] ServerLauncherProperties not restored
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.persistence.dom; package org.eclipse.rse.internal.persistence.dom;
@ -189,22 +190,26 @@ public class RSEDOMImporter {
// but currently we're still using old way of creating subsystem first // but currently we're still using old way of creating subsystem first
IConnectorService service = null; IConnectorService service = null;
// get attributes of the service // get attributes of the service
// String name = connectorServiceNode.getName(); // String name = connectorServiceNode.getName();
// String type = connectorServiceNode.getAttribute(IRSEDOMConstants.ATTRIBUTE_TYPE).getValue(); // String type = connectorServiceNode.getAttribute(IRSEDOMConstants.ATTRIBUTE_TYPE).getValue();
// String group = connectorServiceNode.getAttribute(IRSEDOMConstants.ATTRIBUTE_GROUP).getValue(); // String group = connectorServiceNode.getAttribute(IRSEDOMConstants.ATTRIBUTE_GROUP).getValue();
boolean useSSL = getBooleanValue(connectorServiceNode, IRSEDOMConstants.ATTRIBUTE_USE_SSL); boolean useSSL = getBooleanValue(connectorServiceNode, IRSEDOMConstants.ATTRIBUTE_USE_SSL);
int port = getIntegerValue(connectorServiceNode, IRSEDOMConstants.ATTRIBUTE_PORT); int port = getIntegerValue(connectorServiceNode, IRSEDOMConstants.ATTRIBUTE_PORT);
boolean setServerLauncherProperties = false;
// first restore subsystems (since right now we need subsystem to get at service // first restore subsystems (since right now we need subsystem to get at service
RSEDOMNode[] ssChildren = connectorServiceNode.getChildren(IRSEDOMConstants.TYPE_SUBSYSTEM); RSEDOMNode[] ssChildren = connectorServiceNode.getChildren(IRSEDOMConstants.TYPE_SUBSYSTEM);
for (int s = 0; s < ssChildren.length; s++) { for (int s = 0; s < ssChildren.length; s++) {
RSEDOMNode ssChild = ssChildren[s]; RSEDOMNode ssChild = ssChildren[s];
ISubSystem subSystem = restoreSubSystem(host, ssChild); ISubSystem subSystem = restoreSubSystem(host, ssChild);
if (subSystem != null && service == null) { if (subSystem != null) {
ISubSystemConfiguration subsystemConfiguration = subSystem.getSubSystemConfiguration(); 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)) { if (subsystemConfiguration.supportsServerLaunchProperties(host)) {
IServerLauncherProperties sl = subsystemConfiguration.createServerLauncher(service); IServerLauncherProperties sl = subsystemConfiguration.createServerLauncher(service);
if (sl != null) { if (sl != null) {
@ -215,12 +220,13 @@ public class RSEDOMImporter {
if (slChildren != null && slChildren.length > 0) { if (slChildren != null && slChildren.length > 0) {
serverLauncherPropertiesNode = slChildren[0]; serverLauncherPropertiesNode = slChildren[0];
restoreServerLauncher(service, serverLauncherPropertiesNode, sl); restoreServerLauncher(service, serverLauncherPropertiesNode, sl);
setServerLauncherProperties = true;
} }
} }
} }
service.setPort(port); service.setPort(port);
service.setIsUsingSSL(useSSL); service.setIsUsingSSL(useSSL);
} }
} }
if (service != null && subSystem != null) { if (service != null && subSystem != null) {
subSystem.setConnectorService(service); subSystem.setConnectorService(service);