| commit | 6a6e2fd68e25856cd62e29b5d51d158a9b571712 | [log] [tgz] |
|---|---|---|
| author | eyuen <eyuen> | Wed Mar 30 21:21:48 2011 +0000 |
| committer | eyuen <eyuen> | Wed Mar 30 21:21:48 2011 +0000 |
| tree | 0cacd49e583576ad269752d3a38d04d2bd0ba9e8 | |
| parent | c38385e91b4f46f90bce3790c6dfb524c65a6a81 [diff] |
[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 cc98107..f06cf3b 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
@@ -491,7 +491,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 b80d3fa..4638ce6 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
@@ -1239,9 +1239,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() {