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 6374 invoked by uid 500); 27 Feb 2001 16:24:24 -0000
Delivered-To: apmail-jakarta-tomcat-cvs@apache.org
Received: (qmail 6362 invoked by uid 1052); 27 Feb 2001 16:24:23 -0000
Date: 27 Feb 2001 16:24:23 -0000
Message-ID: <20010227162423.6359.qmail@apache.org>
From: costin@apache.org
To: jakarta-tomcat-cvs@apache.org
Subject: cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core
 Handler.java Request.java ServerSession.java

costin      01/02/27 08:24:23

  Modified:    src/share/org/apache/tomcat/core Handler.java Request.java
                        ServerSession.java
  Log:
  Remove hard-coded dependency on "Counters" - Counters code is still
  experimental and the same thing can be easily done without an explicit
  get/set ( using notes ). That would also allow other "accounting"
  modules to use better data structures.
  
  Revision  Changes    Path
  1.39      +0 -11     jakarta-tomcat/src/share/org/apache/tomcat/core/Handler.java
  
  Index: Handler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Handler.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- Handler.java	2001/02/20 03:17:56	1.38
  +++ Handler.java	2001/02/27 16:24:22	1.39
  @@ -58,7 +58,6 @@
    */ 
   package org.apache.tomcat.core;
   
  -import org.apache.tomcat.util.Counters;
   import org.apache.tomcat.util.log.Log;
   
   /**
  @@ -131,7 +130,6 @@
       Handler prev;
   
   
  -    private Counters cntr=new Counters(ContextManager.MAX_NOTES);
       private Object notes[]=new Object[ContextManager.MAX_NOTES];
   
       // -------------------- Constructor --------------------
  @@ -346,14 +344,5 @@
       public final Object getNote( int pos ) {
   	return notes[pos];
       }
  -
  -    /** Accounting information. Not implemented - it'll contain usefull
  -	information like LAST_ACCESSED, INVOCATION_COUNT, SERVICE_TIME,
  -	ERRROS, IN_INCLUDE, etc.
  -     */
  -    public final Counters getCounters() {
  -	return cntr;
  -    }
  -
   
   }
  
  
  
  1.93      +4 -10     jakarta-tomcat/src/share/org/apache/tomcat/core/Request.java
  
  Index: Request.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Request.java,v
  retrieving revision 1.92
  retrieving revision 1.93
  diff -u -r1.92 -r1.93
  --- Request.java	2001/02/27 02:47:39	1.92
  +++ Request.java	2001/02/27 16:24:22	1.93
  @@ -65,7 +65,6 @@
   import org.apache.tomcat.util.http.ContentType;
   import org.apache.tomcat.util.http.Cookies;
   
  -import org.apache.tomcat.util.Counters;
   import org.apache.tomcat.util.SimplePrincipal;
   import org.apache.tomcat.util.buf.MessageBytes;
   
  @@ -190,8 +189,6 @@
       Exception errorException;
   
       private Object notes[]=new Object[ContextManager.MAX_NOTES];
  -    // Accounting
  -    private Counters cntr=new Counters(ContextManager.MAX_NOTES);
   
       // -------------------- Constructor --------------------
   
  @@ -300,7 +297,6 @@
       public void setServerPort(int serverPort ) {
   	this.serverPort=serverPort;
       }
  -
       public MessageBytes remoteAddr() {
   	return remoteAddrMB;
       }
  @@ -309,6 +305,10 @@
   	return remoteHostMB;
       }
   
  +    public void setRemoteHost(String remoteHost) {
  +	this.remoteHost=remoteHost;
  +    }
  +
       public String getLocalHost() {
   	return localHost;
       }
  @@ -808,10 +808,6 @@
   	return notes[pos];
       }
   
  -    public final Counters getCounters() {
  -	return cntr;
  -    }
  -
       // -------------------- Recycling -------------------- 
       public void recycle() {
   	initRequest();
  @@ -844,8 +840,6 @@
   	
   	scookies.recycle();
   	
  -	// counters and notes
  -        cntr.recycle();
           for( int i=0; i<ContextManager.MAX_NOTES; i++ ) notes[i]=null;
   
   	// sub-req
  
  
  
  1.6       +0 -8      jakarta-tomcat/src/share/org/apache/tomcat/core/ServerSession.java
  
  Index: ServerSession.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ServerSession.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ServerSession.java	2001/02/20 03:17:56	1.5
  +++ ServerSession.java	2001/02/27 16:24:23	1.6
  @@ -68,8 +68,6 @@
   
   import org.apache.tomcat.util.buf.MessageBytes;
   
  -import org.apache.tomcat.util.Counters;
  -
   import org.apache.tomcat.util.threads.TimeStamp;
   
   /**
  @@ -111,7 +109,6 @@
       Object manager;
       Context context;
       private Object notes[]=new Object[ContextManager.MAX_NOTES];
  -    private Counters cntr=new Counters(ContextManager.MAX_NOTES);
       private int state=STATE_NEW;
       Object facade;
       
  @@ -237,10 +234,5 @@
       public final Object getNote( int pos ) {
   	return notes[pos];
       }
  -
  -    public final Counters getCounters() {
  -	return cntr;
  -    }
  -    
   }