diff -r 1260d7851277 j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ServerRegistry.java
--- a/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ServerRegistry.java	Fri Nov 20 16:59:15 2009 +0100
+++ b/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ServerRegistry.java	Fri Nov 20 09:12:28 2009 -0800
@@ -113,12 +113,16 @@
     private synchronized void init() {
         LOGGER.log(Level.FINEST, "Entering registry initialization"); // NOI18N
 
-        if (servers != null && instances != null) {
+        if (servers != null && !servers.isEmpty() && instances != null) {
             return;
         }
 
-        servers = new HashMap();
-        instances = new HashMap();
+        if (null == servers) {
+            servers = new HashMap();
+        }
+        if (null == instances) {
+            instances = new HashMap();
+        }
 
         FileObject dir = FileUtil.getConfigFile(DIR_JSR88_PLUGINS);
         if (dir != null) {
@@ -139,7 +143,7 @@
 
             LOGGER.log(Level.FINE, "Finish initializing plugins"); // NOI18N
             List<String> notInitialized = new LinkedList<String>();
-            for (Map.Entry<String, Server> entry : serversMap().entrySet()) {
+            for (Map.Entry<String, Server> entry : servers.entrySet()) {
                 OptionalDeploymentManagerFactory odmf = entry.getValue().getOptionalFactory();
                 if (null != odmf) {
                     try {
@@ -153,7 +157,7 @@
                     }
                 }
             }
-            serversMap().keySet().removeAll(notInitialized);
+            servers.keySet().removeAll(notInitialized);
         } else {
             LOGGER.log(Level.WARNING, "No DIR_JSR88_PLUGINS folder found, no server plugins will be availabe"); // NOI18N
         }
@@ -175,11 +179,12 @@
                 name = fo.getName();
                 Server server = null;
                 synchronized (this) {
-                    if (serversMap().containsKey(name)) {
+                    if (servers.containsKey(name)) {
                         return;
                     }
                     server = new Server(fo);
-                    serversMap().put(name, server);
+                    servers.put(name, server);
+                    LOGGER.log(Level.INFO,"Serverplugin for "+name+ " added to the registry.");
                 }
                 if (server != null) {
                     firePluginListeners(server, true);