Author: csutherl
Date: Fri Apr 13 15:28:12 2018
New Revision: 1829084
URL: http://svn.apache.org/viewvc?rev=1829084&view=rev
Log:
Fix logic bug from my initial patch.
Modified:
tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
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=1829084&r1=1829083&r2=1829084&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java Fri
Apr 13 15:28:12 2018
@@ -963,8 +963,8 @@ public class NamingContextListener
log.error(sm.getString("naming.bindFailed", e));
}
- if ("javax.sql.DataSource".equals(ref.getClassName()) ||
- "javax.sql.XADataSource".equals(ref.getClassName()) &&
+ if (("javax.sql.DataSource".equals(ref.getClassName()) ||
+ "javax.sql.XADataSource".equals(ref.getClassName())) &&
resource.getSingleton()) {
try {
ObjectName on = createObjectName(resource);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
