Return-Path: <costin@apache.org>
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 83036 invoked by uid 500); 8 Mar 2001 03:51:27 -0000
Delivered-To: apmail-jakarta-tomcat-cvs@apache.org
Received: (qmail 83033 invoked by uid 1052); 8 Mar 2001 03:51:27 -0000
Date: 8 Mar 2001 03:51:27 -0000
Message-ID: <20010308035127.83032.qmail@apache.org>
From: costin@apache.org
To: jakarta-tomcat-cvs@apache.org
Subject: cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core
 Container.java

costin      01/03/07 19:51:27

  Modified:    src/share/org/apache/tomcat/core Container.java
  Log:
  Small fix - getContextManager() instead of contextM.
  
  Probably some of those lazy-initialziations should be removed - it's
  great for performance when it's in the critical path, but for initialization
  it doesn't matter.
  
  Revision  Changes    Path
  1.49      +10 -4     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.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- Container.java	2001/02/27 06:59:14	1.48
  +++ Container.java	2001/03/08 03:51:26	1.49
  @@ -374,12 +374,14 @@
       }
   
       public Object getNote( String name ) throws TomcatException {
  -	int id=contextM.getNoteId( ContextManager.CONTAINER_NOTE, name );
  +	int id=getContextManager().getNoteId( ContextManager.CONTAINER_NOTE,
  +					      name );
   	return getNote( id );
       }
   
       public void setNote( String name, Object value ) throws TomcatException {
  -	int id=contextM.getNoteId( ContextManager.CONTAINER_NOTE, name );
  +	int id=getContextManager().getNoteId( ContextManager.CONTAINER_NOTE,
  +					      name );
   	setNote( id, value );
       }
       
  @@ -399,8 +401,10 @@
       public static final int H_postService=10;
       public static final int H_postRequest=11;
       public static final int H_handleError=12;
  -    public static final int H_engineInit=13;
  -    public static final int H_COUNT=14;
  +    public static final int H_getInfo=13;
  +    public static final int H_setInfo=14;
  +    public static final int H_engineInit=15;
  +    public static final int H_COUNT=16;
   
       Hooks hooks=new Hooks();
       BaseInterceptor hooksCache[][]=null;
  @@ -420,6 +424,8 @@
   	hooks.registerHook( "postService", H_postService );
   	hooks.registerHook( "postRequest", H_postRequest );
   	hooks.registerHook( "handleError", H_handleError );
  +	hooks.registerHook( "getInfo", H_getInfo );
  +	hooks.registerHook( "setInfo", H_setInfo );
   	hooks.registerHook( "engineInit", H_engineInit );
       }