remm 2003/10/26 23:39:20
Modified: catalina/src/share/org/apache/catalina/core
StandardDefaultContext.java
Log:
- Port patch.
Revision Changes Path
1.11 +16 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java
Index: StandardDefaultContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- StandardDefaultContext.java 21 Oct 2003 00:22:57 -0000 1.10
+++ StandardDefaultContext.java 27 Oct 2003 07:39:19 -0000 1.11
@@ -1341,7 +1341,14 @@
}
listener.addResource(contextEntry);
}
- String [] envRefs = findResourceEnvRefs();
+ ContextResourceLink [] resourceLinks = findResourceLinks();
+ for (int i = 0; i < resourceLinks.length; i++) {
+ ContextResourceLink contextEntry = resourceLinks[i];
+ if (contextResources.exists(contextEntry.getName())) {
+ listener.removeResourceLink(contextEntry.getName());
+ }
+ listener.addResourceLink(contextEntry);
+ } String [] envRefs = findResourceEnvRefs();
for (int i = 0; i < envRefs.length; i++) {
if (contextResources.exists(envRefs[i])) {
listener.removeResourceEnvRef(envRefs[i]);
@@ -1468,6 +1475,10 @@
ContextResource [] resources = findResources();
for( int i = 0; i < resources.length; i++ ) {
context.addResource(resources[i]);
+ }
+ ContextResourceLink [] resourceLinks = findResourceLinks();
+ for( int i = 0; i < resourceLinks.length; i++ ) {
+ context.addResourceLink(resourceLinks[i]);
}
String [] envRefs = findResourceEnvRefs();
for( int i = 0; i < envRefs.length; i++ ) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
