mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-26 10:25:32 +02:00
Code Issues Wiki Activity

[430905] need to check for duplicate subsystem on profile restore

Browse source
This commit is contained in:
Dave McKnight 2014-03-21 15:07:54 -04:00
parent 2acc687d5b
commit a537c62d41
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,6 +29,7 @@
* Uwe Stieber (Wind River) - [283844] NPE on restoring property set if persistent data is corrupted * Uwe Stieber (Wind River) - [283844] NPE on restoring property set if persistent data is corrupted
* David McKnight (IBM) -[391132] filterpools don't persist when profile names end in _ * David McKnight (IBM) -[391132] filterpools don't persist when profile names end in _
* David McKnight (IBM) -[425026] import connection fails to create default filters when no prior connections * David McKnight (IBM) -[425026] import connection fails to create default filters when no prior connections
* David McKnight (IBM) -[430905] need to check for duplicate subsystem on profile restore
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.internal.persistence.dom; package org.eclipse.rse.internal.persistence.dom;
@ -323,7 +324,9 @@ public class RSEDOMImporter {
// need to switch factories // need to switch factories
subSystem.switchServiceFactory(factory); subSystem.switchServiceFactory(factory);
} }
} else { }
if (subSystem == null){ // just because we didn't find a service subsystem, doesn't mean we won't find
// a subsystem that matches this type
ISubSystemConfiguration config = _registry.getSubSystemConfiguration(type); ISubSystemConfiguration config = _registry.getSubSystemConfiguration(type);
if (config!=null) { if (config!=null) {
ISubSystem[] existingSubSystems = config.getSubSystems(host, true); ISubSystem[] existingSubSystems = config.getSubSystems(host, true);