From a33878fcc09dc9be84fc801ab0115268b74adadb Mon Sep 17 00:00:00 2001 From: remm Date: Tue, 26 Sep 2006 13:18:43 +0000 Subject: [PATCH] - 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 --- java/org/apache/catalina/deploy/ContextService.java | 4 ++++ java/org/apache/catalina/deploy/NamingResources.java | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/deploy/ContextService.java b/java/org/apache/catalina/deploy/ContextService.java index 3e2c7160d..b16e54166 100644 --- 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 583a4002c..7d145cf78 100644 --- 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) { -- 2.11.0