svn commit: r1824774 - in /tomcat/trunk: java/org/apache/catalina/core/NamingContextListener.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Mon Feb 19 16:33:43 2018
New Revision: 1824774

URL: http://svn.apache.org/viewvc?rev=1824774&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=62218
Correctly create a JNDI ServiceRef using the specified interface rather than 
the concrete type.
Based on a suggestion by Ángel Álvarez Páscua.

Modified:
    tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=1824774&r1=1824773&r2=1824774&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java Mon 
Feb 19 16:33:43 2018
@@ -998,7 +998,7 @@ public class NamingContextListener
 
         // Create a reference to the resource.
         Reference ref = new ServiceRef
-            (service.getName(), service.getType(), service.getServiceqname(),
+            (service.getName(), service.getInterface(), 
service.getServiceqname(),
              service.getWsdlfile(), service.getJaxrpcmappingfile());
         // Adding the additional port-component-ref, if any
         Iterator<String> portcomponent = service.getServiceendpoints();

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1824774&r1=1824773&r2=1824774&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Feb 19 16:33:43 2018
@@ -75,6 +75,11 @@
         calling <code>kill -0 &lt;pid&gt;</code> fails. Based on a suggestion
         from Mark Morschhaeuser. (markt)
       </fix>
+      <fix>
+        <bug>62218</bug>: Correctly create a JNDI <code>ServiceRef</code> using
+        the specified interface rather than the concrete type. Based on a
+        suggestion by Ángel Álvarez Páscua. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">



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