|
Lines 23-28
Link Here
|
| 23 |
* David Dykstal (IBM) - [232126] retrieve persisted filter type attribute |
23 |
* David Dykstal (IBM) - [232126] retrieve persisted filter type attribute |
| 24 |
* David Dykstal (IBM) - [233876] filters lost after restart |
24 |
* David Dykstal (IBM) - [233876] filters lost after restart |
| 25 |
* David Dykstal (IBM) - [236516] Bug in user code causes failure in RSE initialization |
25 |
* David Dykstal (IBM) - [236516] Bug in user code causes failure in RSE initialization |
|
|
26 |
* David McKnight (IBM) - [252019] Backport [dstore] ServerLauncherProperties not restored |
| 26 |
********************************************************************************/ |
27 |
********************************************************************************/ |
| 27 |
|
28 |
|
| 28 |
package org.eclipse.rse.internal.persistence.dom; |
29 |
package org.eclipse.rse.internal.persistence.dom; |
|
Lines 196-210
Link Here
|
| 196 |
boolean useSSL = getBooleanValue(connectorServiceNode, IRSEDOMConstants.ATTRIBUTE_USE_SSL); |
197 |
boolean useSSL = getBooleanValue(connectorServiceNode, IRSEDOMConstants.ATTRIBUTE_USE_SSL); |
| 197 |
int port = getIntegerValue(connectorServiceNode, IRSEDOMConstants.ATTRIBUTE_PORT); |
198 |
int port = getIntegerValue(connectorServiceNode, IRSEDOMConstants.ATTRIBUTE_PORT); |
| 198 |
|
199 |
|
|
|
200 |
boolean setServerLauncherProperties = false; |
| 201 |
|
| 199 |
// first restore subsystems (since right now we need subsystem to get at service |
202 |
// first restore subsystems (since right now we need subsystem to get at service |
| 200 |
RSEDOMNode[] ssChildren = connectorServiceNode.getChildren(IRSEDOMConstants.TYPE_SUBSYSTEM); |
203 |
RSEDOMNode[] ssChildren = connectorServiceNode.getChildren(IRSEDOMConstants.TYPE_SUBSYSTEM); |
| 201 |
for (int s = 0; s < ssChildren.length; s++) { |
204 |
for (int s = 0; s < ssChildren.length; s++) { |
| 202 |
RSEDOMNode ssChild = ssChildren[s]; |
205 |
RSEDOMNode ssChild = ssChildren[s]; |
| 203 |
ISubSystem subSystem = restoreSubSystem(host, ssChild); |
206 |
ISubSystem subSystem = restoreSubSystem(host, ssChild); |
| 204 |
if (subSystem != null && service == null) { |
207 |
if (subSystem != null) { |
| 205 |
ISubSystemConfiguration subsystemConfiguration = subSystem.getSubSystemConfiguration(); |
208 |
ISubSystemConfiguration subsystemConfiguration = subSystem.getSubSystemConfiguration(); |
| 206 |
service = subsystemConfiguration.getConnectorService(host); |
209 |
if (service == null){ |
| 207 |
if (service != null) { |
210 |
service = subsystemConfiguration.getConnectorService(host); |
|
|
211 |
} |
| 212 |
if (service != null && !setServerLauncherProperties) { |
| 208 |
if (subsystemConfiguration.supportsServerLaunchProperties(host)) { |
213 |
if (subsystemConfiguration.supportsServerLaunchProperties(host)) { |
| 209 |
IServerLauncherProperties sl = subsystemConfiguration.createServerLauncher(service); |
214 |
IServerLauncherProperties sl = subsystemConfiguration.createServerLauncher(service); |
| 210 |
if (sl != null) { |
215 |
if (sl != null) { |
|
Lines 215-226
Link Here
|
| 215 |
if (slChildren != null && slChildren.length > 0) { |
220 |
if (slChildren != null && slChildren.length > 0) { |
| 216 |
serverLauncherPropertiesNode = slChildren[0]; |
221 |
serverLauncherPropertiesNode = slChildren[0]; |
| 217 |
restoreServerLauncher(service, serverLauncherPropertiesNode, sl); |
222 |
restoreServerLauncher(service, serverLauncherPropertiesNode, sl); |
|
|
223 |
setServerLauncherProperties = true; |
| 218 |
} |
224 |
} |
| 219 |
} |
225 |
} |
| 220 |
} |
226 |
} |
| 221 |
service.setPort(port); |
227 |
service.setPort(port); |
| 222 |
service.setIsUsingSSL(useSSL); |
228 |
service.setIsUsingSSL(useSSL); |
| 223 |
} |
229 |
} |
| 224 |
} |
230 |
} |
| 225 |
if (service != null && subSystem != null) { |
231 |
if (service != null && subSystem != null) { |
| 226 |
subSystem.setConnectorService(service); |
232 |
subSystem.setConnectorService(service); |
