fix NPE at shutdown

4 files changed, 24 insertions, 10 deletions

diff --git a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/Activator.java b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/Activator.java
index d29ce6efd..d50d1dbac 100644
--- a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/Activator.java
+++ b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/Activator.java
@@ -53,9 +53,13 @@ public class Activator implements BundleActivator, ServiceFactory, ServiceTracke
 	 */
 	public void stop(BundleContext context) throws Exception {
 		prefsTracker.close();
-		registration.unregister();
-		userAdmin.destroy();
-		userAdmin = null;
+		if(registration != null)
+		{
+			registration.unregister();
+			registration = null;
+			userAdmin.destroy();
+			userAdmin = null;
+		}
 	}
 
 	/**
diff --git a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/ExternalMessages.properties b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/ExternalMessages.properties
index 386f94669..4e658dfd7 100644
--- a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/ExternalMessages.properties
+++ b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/ExternalMessages.properties
@@ -24,9 +24,4 @@ CREATE_NULL_ROLE_EXCEPTION =Role can not be null
 CREATE_INVALID_TYPE_ROLE_EXCEPTION=Invalid type for createRole
 INVALID_KEY_EXCEPTION=Key can only be of type String
 INVALID_VALUE_EXCEPTION=Value can only be of type String or byte[]
-USERADMIN_UNREGISTERED_EXCEPTION=UserAdmin service has been unregistered
-
-Unknown_Log_level=Unknown Log Level
-Info=Log Info
-Warning=Log Warning
-Error=Log Error
\ No newline at end of file
+USERADMIN_UNREGISTERED_EXCEPTION=UserAdmin service has been unregistered
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/LogMessages.properties b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/LogMessages.properties
new file mode 100644
index 000000000..f22b676e2
--- /dev/null
+++ b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/LogMessages.properties
@@ -0,0 +1,15 @@
+###############################################################################
+# Copyright (c) 2001, 2005 IBM Corporation.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+# NLS_MESSAGEFORMAT_ALL 
+Unknown_Log_level=Unknown Log Level
+Info=Log Info
+Warning=Log Warning
+Error=Log Error
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/LogTrackerMsg.java b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/LogTrackerMsg.java
index 127910bad..d257de27d 100644
--- a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/LogTrackerMsg.java
+++ b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/useradmin/LogTrackerMsg.java
@@ -13,7 +13,7 @@ package org.eclipse.equinox.useradmin;
 import org.eclipse.osgi.util.NLS;
 
 public class LogTrackerMsg extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.equinox.useradmin.ExternalMessages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.equinox.useradmin.LogMessages"; //$NON-NLS-1$
 
 	public static String Unknown_Log_level;
 	public static String Info;