User: starksm
Date: 02/02/20 23:07:42
Modified: src/main/org/jboss/web AbstractWebContainer.java
Log:
Still needed a more exact match of the war module to deployment name
to handle names that are substrings of each other(jbosstest.war and
notjbosstest.war).
Revision Changes Path
1.31 +7 -4 jboss/src/main/org/jboss/web/AbstractWebContainer.java
Index: AbstractWebContainer.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/web/AbstractWebContainer.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- AbstractWebContainer.java 21 Feb 2002 03:32:15 -0000 1.30
+++ AbstractWebContainer.java 21 Feb 2002 07:07:42 -0000 1.31
@@ -146,7 +146,7 @@
@see org.jboss.security.SecurityAssociation;
@author [EMAIL PROTECTED]
-@version $Revision: 1.30 $
+@version $Revision: 1.31 $
*/
public abstract class AbstractWebContainer
extends ServiceMBeanSupport
@@ -213,9 +213,12 @@
mod = (J2eeModuleMetaData) it.next();
if( mod.isWeb() )
{
- //only pick up the context for our war, the names should match
- // The wars come from packages and thus are unpackaged under
/tmp/deploy/<intNumber>.myweb.war
- if (di.shortName.lastIndexOf(mod.getFileName()) != -1)
+ /* Only pick up the context for our war, the di.shortName is
+ <int>.myweb.war so we add a '.' to the module file name and
+ then test shortName ends with the matching name.
+ */
+ String matchName = '.' + mod.getFileName();
+ if( di.shortName.endsWith(matchName) == true )
di.webContext = mod.getWebContext();
}
}
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
