[467865] Add some logging Change-Id: I48f98e2799f2ddac6a3e7063675f1c27092336f2
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ConfigurationResourceListener.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ConfigurationResourceListener.java index d59bda4..c034693 100644 --- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ConfigurationResourceListener.java +++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/ConfigurationResourceListener.java
@@ -12,6 +12,9 @@ **********************************************************************/ package org.eclipse.jst.server.tomcat.core.internal; +import java.util.ArrayList; +import java.util.List; + import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResourceChangeEvent; @@ -26,6 +29,7 @@ public class ConfigurationResourceListener implements IResourceChangeListener { private IProject serversProject; + private List<String> errorLogged = new ArrayList<>(); /** * Currently, only changes to Tomcat configuration files are detected and the associated @@ -51,7 +55,13 @@ IServerType serverType = servers[j].getServerType(); String tomcatServerTypePrefix = "org.eclipse.jst.server.tomcat."; // potential NPE arises if the runtime is renamed - if (serverType.getId() != null && serverType.getId().length() > tomcatServerTypePrefix.length() && tomcatServerTypePrefix.equals(serverType.getId().substring(0, tomcatServerTypePrefix.length()))) { + if (serverType == null) { + if (!errorLogged.contains(servers[j].getName())) { + errorLogged.add(servers[j].getName()); + TomcatPlugin.log("Could not determine server type for " + servers[j].getName()); + } + } + else if (serverType.getId() != null && serverType.getId().length() > tomcatServerTypePrefix.length() && tomcatServerTypePrefix.equals(serverType.getId().substring(0, tomcatServerTypePrefix.length()))) { IFolder configFolder = servers[j].getServerConfiguration(); if (configFolder != null) { if (childDelta[i].getFullPath().equals(configFolder.getFullPath())) {