- Use the interface rather than the type (which is apparently null here).

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@450040 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/deploy/ContextService.java b/java/org/apache/catalina/deploy/ContextService.java
index 3e2c716..b16e541 100644 (file)
--- a/java/org/apache/catalina/deploy/ContextService.java
+++ b/java/org/apache/catalina/deploy/ContextService.java
@@ -203,6 +203,10 @@ public class ContextService extends ResourceBase implements Serializable {
             sb.append(", displayname=");
             sb.append(displayname);
         }
+        if (serviceinterface != null) {
+            sb.append(", serviceinterface=");
+            sb.append(serviceinterface);
+        }
         if (icon != null) {
             sb.append(", icon=");
             sb.append(icon);

diff --git a/java/org/apache/catalina/deploy/NamingResources.java b/java/org/apache/catalina/deploy/NamingResources.java
index 583a400..7d145cf 100644 (file)
--- a/java/org/apache/catalina/deploy/NamingResources.java
+++ b/java/org/apache/catalina/deploy/NamingResources.java
@@ -336,11 +336,11 @@ public class NamingResources implements Serializable {
      * @param service New web service reference
      */
     public void addService(ContextService service) {
-        
+
         if (entries.containsKey(service.getName())) {
             return;
         } else {
-            entries.put(service.getName(), service.getType());
+            entries.put(service.getName(), service.getServiceinterface());
         }
         
         synchronized (services) {