tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject svn commit: r450040 - in /tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy: ContextService.java NamingResources.java
Date Tue, 26 Sep 2006 13:18:46 GMT
Author: remm
Date: Tue Sep 26 06:18:43 2006
New Revision: 450040

URL: http://svn.apache.org/viewvc?view=rev&rev=450040
Log:
- Use the interface rather than the type (which is apparently null here).

Modified:
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/ContextService.java
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/ContextService.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/ContextService.java?view=diff&rev=450040&r1=450039&r2=450040
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/ContextService.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/ContextService.java Tue Sep 26 06:18:43
2006
@@ -203,6 +203,10 @@
             sb.append(", displayname=");
             sb.append(displayname);
         }
+        if (serviceinterface != null) {
+            sb.append(", serviceinterface=");
+            sb.append(serviceinterface);
+        }
         if (icon != null) {
             sb.append(", icon=");
             sb.append(icon);

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java?view=diff&rev=450040&r1=450039&r2=450040
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/NamingResources.java Tue Sep 26 06:18:43
2006
@@ -336,11 +336,11 @@
      * @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) {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message