Author: markt
Date: Tue May 20 11:12:57 2014
New Revision: 1596197
URL: http://svn.apache.org/r1596197
Log:
Fix logic error
Modified:
tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java
Modified: tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java?rev=1596197&r1=1596196&r2=1596197&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java Tue May 20
11:12:57 2014
@@ -91,7 +91,9 @@ public abstract class FactoryBase implem
}
// Check for a default factory
- factory = getDefaultFactory(ref);
+ if (factory == null) {
+ factory = getDefaultFactory(ref);
+ }
if (factory != null) {
return factory.getObjectInstance(obj, name, nameCtx,
environment);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
