remm 2004/12/15 04:01:28
Modified: catalina/src/share/org/apache/catalina/core
NamingContextListener.java
Log:
- 32713: Bad binding of resource-env-ref.
Revision Changes Path
1.11 +5 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/NamingContextListener.java
Index: NamingContextListener.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/NamingContextListener.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- NamingContextListener.java 8 Oct 2004 09:34:02 -0000 1.10
+++ NamingContextListener.java 15 Dec 2004 12:01:27 -0000 1.11
@@ -859,7 +859,7 @@
// Create a reference to the resource env.
Reference ref = new ResourceEnvRef(resourceEnvRef.getType());
- // FIXME: Adding the additional parameters, if any
+ // Adding the additional parameters, if any
Iterator params = resourceEnvRef.listProperties();
while (params.hasNext()) {
String paramName = (String) params.next();
@@ -869,9 +869,9 @@
}
try {
if (logger.isDebugEnabled())
- log.debug(" Adding resource env ref " + name);
- createSubcontexts(envCtx, name);
- envCtx.bind(name, ref);
+ log.debug(" Adding resource env ref " +
resourceEnvRef.getName());
+ createSubcontexts(envCtx, resourceEnvRef.getName());
+ envCtx.bind(resourceEnvRef.getName(), ref);
} catch (NamingException e) {
logger.error(sm.getString("naming.bindFailed", e));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
