[325395] NPE in org.eclipse.wst.server.core.internal.ResourceManager.registerServer
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerCore.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerCore.java
index d226f33..2832b75 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerCore.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerCore.java
@@ -1,5 +1,5 @@
/**********************************************************************
- * Copyright (c) 2003, 2010 IBM Corporation and others.
+ * Copyright (c) 2003, 2011 IBM Corporation and others.
* 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
@@ -469,7 +469,7 @@
PublishController[] controllers = ServerPlugin.getPublishController();
if (controllers.length > 0){
for (PublishController controller : controllers){
- if (controller.supportsType(server.getServerType().getId()))
+ if (server.getServerType() != null && controller.supportsType(server.getServerType().getId()))
return controller.isPublishRequired(server, delta2);
}
}
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ResourceManager.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ResourceManager.java
index 643d720..160d886 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ResourceManager.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ResourceManager.java
@@ -1120,9 +1120,11 @@
fireServerEvent(server, EVENT_ADDED);
ServerType serverType = (ServerType) server.getServerType();
- String bundleId = serverType.getNamespace();
- if (activeBundles != null && !activeBundles.contains(bundleId))
- activeBundles.add(bundleId);
+ if (serverType != null) {
+ String bundleId = serverType.getNamespace();
+ if (activeBundles != null && !activeBundles.contains(bundleId))
+ activeBundles.add(bundleId);
+ }
}
public String toString() {
