Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2007-03-19 18:55:37 -0400
committerslewis2007-03-19 18:55:37 -0400
commita7cb357966e8c9651e652f1cbd1712d68022303b (patch)
tree5f997fca73761ae76432ddb40c9d641a851907ba /framework/bundles/org.eclipse.ecf.identity/src
parent910ff6e72acc3579c65f7d81546db45ae874251e (diff)
downloadorg.eclipse.ecf-a7cb357966e8c9651e652f1cbd1712d68022303b.tar.gz
org.eclipse.ecf-a7cb357966e8c9651e652f1cbd1712d68022303b.tar.xz
org.eclipse.ecf-a7cb357966e8c9651e652f1cbd1712d68022303b.zip
Fix for new application launching structure (different number of parameters) and for XMPPRoomID creation problem
Diffstat (limited to 'framework/bundles/org.eclipse.ecf.identity/src')
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/PlatformHelper.java3
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/Trace.java4
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Activator.java2
3 files changed, 6 insertions, 3 deletions
diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/PlatformHelper.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/PlatformHelper.java
index e2978a3ae..7a7a3e207 100644
--- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/PlatformHelper.java
+++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/PlatformHelper.java
@@ -36,7 +36,8 @@ public class PlatformHelper {
static {
try {
- platformClass = Class.forName("org.eclipse.core.runtime.Platform"); //$NON-NLS-1$
+ platformClass = Class.forName(
+ "org.eclipse.core.runtime.Platform"); //$NON-NLS-1$
} catch (ClassNotFoundException e) {
// Platform not available...just leave platformClass == null
}
diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/Trace.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/Trace.java
index d7b3d0ad0..3d43914b2 100644
--- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/Trace.java
+++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/Trace.java
@@ -136,7 +136,9 @@ public class Trace {
protected static boolean shouldTrace0(String option) {
if (option == null)
return false;
- DebugOptions debugOptions = Activator.getDefault().getDebugOptions();
+ Activator activator = Activator.getDefault();
+ if (activator == null) return false;
+ DebugOptions debugOptions = activator.getDebugOptions();
if (debugOptions == null) return false;
String result = debugOptions.getOption(option);
return (result == null)?false:result.equalsIgnoreCase("true"); //$NON-NLS-1$
diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Activator.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Activator.java
index 0e615139b..9c9031ead 100644
--- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Activator.java
+++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Activator.java
@@ -336,7 +336,6 @@ public class Activator implements BundleActivator {
if (reg != null)
reg.removeRegistryChangeListener(registryManager);
registryManager = null;
- plugin = null;
if (logServiceTracker != null) {
logServiceTracker.close();
logServiceTracker = null;
@@ -358,6 +357,7 @@ public class Activator implements BundleActivator {
adapterManagerTracker = null;
}
context = null;
+ plugin = null;
}
/**

Back to the top