remm 02/05/23 15:27:46
Modified: catalina/src/share/org/apache/catalina/core
NamingContextListener.java
Log:
- Bind resource links first.
Revision Changes Path
1.15 +22 -23
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/NamingContextListener.java
Index: NamingContextListener.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/NamingContextListener.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- NamingContextListener.java 17 May 2002 01:56:40 -0000 1.14
+++ NamingContextListener.java 23 May 2002 22:27:46 -0000 1.15
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/NamingContextListener.java,v
1.14 2002/05/17 01:56:40 remm Exp $
- * $Revision: 1.14 $
- * $Date: 2002/05/17 01:56:40 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/NamingContextListener.java,v
1.15 2002/05/23 22:27:46 remm Exp $
+ * $Revision: 1.15 $
+ * $Date: 2002/05/23 22:27:46 $
*
* ====================================================================
*
@@ -118,7 +118,7 @@
* with each context and server.
*
* @author Remy Maucherat
- * @version $Revision: 1.14 $ $Date: 2002/05/17 01:56:40 $
+ * @version $Revision: 1.15 $ $Date: 2002/05/23 22:27:46 $
*/
public class NamingContextListener
@@ -682,17 +682,11 @@
if (namingResources == null)
namingResources = new NamingResources();
- // Environment entries
- ContextEnvironment[] contextEnvironments =
- namingResources.findEnvironments();
- for (i = 0; i < contextEnvironments.length; i++) {
- addEnvironment(contextEnvironments[i]);
- }
-
- // EJB references
- ContextEjb[] ejbs = namingResources.findEjbs();
- for (i = 0; i < ejbs.length; i++) {
- addEjb(ejbs[i]);
+ // Resource links
+ ContextResourceLink[] resourceLinks =
+ namingResources.findResourceLinks();
+ for (i = 0; i < resourceLinks.length; i++) {
+ addResourceLink(resourceLinks[i]);
}
// Resources
@@ -701,13 +695,6 @@
addResource(resources[i]);
}
- // Resource links
- ContextResourceLink[] resourceLinks =
- namingResources.findResourceLinks();
- for (i = 0; i < resourceLinks.length; i++) {
- addResourceLink(resourceLinks[i]);
- }
-
// Resources Env
String[] resourceEnvRefs = namingResources.findResourceEnvRefs();
for (i = 0; i < resourceEnvRefs.length; i++) {
@@ -716,6 +703,19 @@
addResourceEnvRef(key, type);
}
+ // Environment entries
+ ContextEnvironment[] contextEnvironments =
+ namingResources.findEnvironments();
+ for (i = 0; i < contextEnvironments.length; i++) {
+ addEnvironment(contextEnvironments[i]);
+ }
+
+ // EJB references
+ ContextEjb[] ejbs = namingResources.findEjbs();
+ for (i = 0; i < ejbs.length; i++) {
+ addEjb(ejbs[i]);
+ }
+
// Binding a User Transaction reference
if (container instanceof Context) {
try {
@@ -873,7 +873,6 @@
createSubcontexts(envCtx, resource.getName());
envCtx.bind(resource.getName(), ref);
} catch (NamingException e) {
- e.printStackTrace();
log(sm.getString("naming.bindFailed", e));
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
