From 3a6d940b12b5422bda0700a80808bed48ff22f18 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Thu, 19 Apr 2007 17:28:29 +0000 Subject: [PATCH] [182802] null pointer check and some logging messages. I can't reproduce this but logging to see if we can gather more info on how this happens. --- .../core/subsystems/SubSystemConfiguration.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java index 68c9021a1d1..9390b285e60 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java @@ -920,9 +920,17 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration public void renameSubSystemsByConnection(IHost conn, String newConnectionName) { ISubSystem[] subsystems = getSubSystems(conn, ISubSystemConfiguration.FORCE_INTO_MEMORY); - for (int idx = 0; idx < subsystems.length; idx++) + if (subsystems != null) { - subsystems[idx].renamingConnection(newConnectionName); + for (int idx = 0; idx < subsystems.length; idx++) + { + subsystems[idx].renamingConnection(newConnectionName); + } + } + else + { + // strange situation..log this + RSEUIPlugin.logInfo("renameSubSystemsByConnection for " + conn.getAliasName() + " has no subsystems" ); } try { @@ -1033,6 +1041,7 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration boolean subsystemsRestored = subSystemsHaveBeenRestored(conn); if (!subsystemsRestored && force) { + RSEUIPlugin.logInfo("in SubSystemConfiguration.getSubSystems(conn, force) - not restored"); /*FIXME - this should now be triggered by new persistence model try { @@ -1054,6 +1063,7 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration } else if (!subsystemsRestored && !force) { + RSEUIPlugin.logInfo("in SubSystemConfiguration.getSubSytems(conn, force) - returning empty array"); return EMPTY_SUBSYSTEM_ARRAY; } else