costin 01/02/05 22:40:07
Modified: src/share/org/apache/tomcat/core BaseInterceptor.java
Container.java
Log:
A small change in Container/BaseInterceptor regarding module add.
The "registerHooks" needs access to the ContextManager and Context ( for
local interceptors ) to do anything usefull.
( the method was added last year to allow modules full control over how
they are added to the server, including ordering. It is not used so far,
but if we run into ordering problems with the modules that will be the
solution. )
Revision Changes Path
1.41 +1 -1
jakarta-tomcat/src/share/org/apache/tomcat/core/BaseInterceptor.java
Index: BaseInterceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/BaseInterceptor.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- BaseInterceptor.java 2001/02/03 05:43:18 1.40
+++ BaseInterceptor.java 2001/02/06 06:40:06 1.41
@@ -587,7 +587,7 @@
* Most modules are added to the Hooks automatically. A module
* overriding this method has full control over this process.
*/
- public int registerHooks(Hooks h) {
+ public int registerHooks(Hooks h, ContextManager cm, Context ctx) {
return DECLINED;
}
1.46 +1 -1 jakarta-tomcat/src/share/org/apache/tomcat/core/Container.java
Index: Container.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Container.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- Container.java 2001/02/01 04:47:12 1.45
+++ Container.java 2001/02/06 06:40:06 1.46
@@ -422,7 +422,7 @@
bi.setContext( getContext() );
if( Hooks.hasHook( bi, "registerHooks" ) ) {
- bi.registerHooks( hooks );
+ bi.registerHooks( hooks, contextM, context );
} else {
hooks.addModule( bi );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
