costin 01/03/07 15:52:49
Modified: src/share/org/apache/tomcat/modules/mappers
ReloadInterceptor.java
Log:
Set the DependManager on contextAdd, it'll be available in contextInit
( no need to check/create, all options are set in the ReloadInterceptor,
where reloading is configured ) ( assuming someone adds the config
options - right now they are not exposed )
Revision Changes Path
1.4 +12 -6
jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers/ReloadInterceptor.java
Index: ReloadInterceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/mappers/ReloadInterceptor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ReloadInterceptor.java 2001/02/27 16:56:30 1.3
+++ ReloadInterceptor.java 2001/03/07 23:52:48 1.4
@@ -94,6 +94,18 @@
public void setFullReload( boolean full ) {
fullReload=full;
}
+
+ public void addContext( ContextManager cm, Context context)
+ throws TomcatException
+ {
+ DependManager dm=(DependManager)context.getContainer().
+ getNote("DependManager");
+ if( dm==null ) {
+ dm=new DependManager();
+ context.getContainer().setNote("DependManager", dm);
+ }
+
+ }
/** Example of adding web.xml to the dependencies.
* JspInterceptor can add all taglib descriptors.
@@ -104,12 +116,6 @@
ContextManager cm = context.getContextManager();
DependManager dm=(DependManager)context.getContainer().
getNote("DependManager");
- // getDependManager();
- if( dm==null ) {
- dm=new DependManager();
- context.getContainer().setNote("DependManager", dm);
- //setDependManager( dm );
- }
File inf_xml = new File(context.getAbsolutePath() +
"/WEB-INF/web.xml");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
