craigmcc 00/11/09 22:42:53
Modified: src/share/org/apache/tomcat/core Tag: tomcat_32
BufferedServletOutputStream.java
ContextManager.java
src/share/org/apache/tomcat/facade Tag: tomcat_32
ServletContextFacade.java
ServletOutputStreamFacade.java
src/share/org/apache/tomcat/service Tag: tomcat_32
JNIEndpoint.java PoolTcpEndpoint.java
SimpleTcpEndpoint.java TcpEndpoint.java
src/share/org/apache/tomcat/service/connector Tag: tomcat_32
Ajp12ConnectionHandler.java
JNIConnectionHandler.java
src/share/org/apache/tomcat/util Tag: tomcat_32
MessageBytes.java MimeHeaderField.java
MimeHeaders.java
Log:
Make references to StringManager instances static in all relevant cases,
because the actual strings (and corresponding resource bundles) do not
change while Tomcat is running. This should positively impact
performance, with no negative consequences.
PR: BugRat Bug Report #110
Revision Changes Path
No revision
No revision
1.14.2.2 +4 -4
jakarta-tomcat/src/share/org/apache/tomcat/core/Attic/BufferedServletOutputStream.java
Index: BufferedServletOutputStream.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Attic/BufferedServletOutputStream.java,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -u -r1.14.2.1 -r1.14.2.2
--- BufferedServletOutputStream.java 2000/08/23 16:57:59 1.14.2.1
+++ BufferedServletOutputStream.java 2000/11/10 06:42:48 1.14.2.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Attic/BufferedServletOutputStream.java,v
1.14.2.1 2000/08/23 16:57:59 jiricka Exp $
- * $Revision: 1.14.2.1 $
- * $Date: 2000/08/23 16:57:59 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Attic/BufferedServletOutputStream.java,v
1.14.2.2 2000/11/10 06:42:48 craigmcc Exp $
+ * $Revision: 1.14.2.2 $
+ * $Date: 2000/11/10 06:42:48 $
*
* ====================================================================
*
@@ -90,7 +90,7 @@
*/
public class BufferedServletOutputStream extends ServletOutputStream {
- protected StringManager sm =
+ protected static StringManager sm =
StringManager.getManager(Constants.Package);
protected boolean usingWriter = false;
1.100.2.17 +1 -1
jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java
Index: ContextManager.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java,v
retrieving revision 1.100.2.16
retrieving revision 1.100.2.17
diff -u -r1.100.2.16 -r1.100.2.17
--- ContextManager.java 2000/11/09 21:42:54 1.100.2.16
+++ ContextManager.java 2000/11/10 06:42:48 1.100.2.17
@@ -122,7 +122,7 @@
/**
* The string constants for this ContextManager.
*/
- private StringManager sm = StringManager.getManager("org.apache.tomcat.core");
+ private static StringManager sm =
StringManager.getManager("org.apache.tomcat.core");
/** Global interceptors - all requests that will be served by this
engine will pass those filters
No revision
No revision
1.3.2.1 +1 -1
jakarta-tomcat/src/share/org/apache/tomcat/facade/Attic/ServletContextFacade.java
Index: ServletContextFacade.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/facade/Attic/ServletContextFacade.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- ServletContextFacade.java 2000/05/30 15:40:09 1.3
+++ ServletContextFacade.java 2000/11/10 06:42:49 1.3.2.1
@@ -81,7 +81,7 @@
*/
final class ServletContextFacade implements ServletContext {
// Use the strings from core
- private StringManager sm = StringManager.getManager("org.apache.tomcat.core");
+ private static StringManager sm =
StringManager.getManager("org.apache.tomcat.core");
private ContextManager contextM;
private Context context;
1.4.2.1 +1 -1
jakarta-tomcat/src/share/org/apache/tomcat/facade/Attic/ServletOutputStreamFacade.java
Index: ServletOutputStreamFacade.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/facade/Attic/ServletOutputStreamFacade.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- ServletOutputStreamFacade.java 2000/06/22 00:15:02 1.4
+++ ServletOutputStreamFacade.java 2000/11/10 06:42:49 1.4.2.1
@@ -70,7 +70,7 @@
*/
final class ServletOutputStreamFacade extends ServletOutputStream {
// Use the strings from core
- protected StringManager sm = StringManager.
+ protected static StringManager sm = StringManager.
getManager("org.apache.tomcat.core");
// encoding
No revision
No revision
1.3.2.1 +4 -4
jakarta-tomcat/src/share/org/apache/tomcat/service/JNIEndpoint.java
Index: JNIEndpoint.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/JNIEndpoint.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- JNIEndpoint.java 2000/06/22 23:39:51 1.3
+++ JNIEndpoint.java 2000/11/10 06:42:50 1.3.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/JNIEndpoint.java,v 1.3
2000/06/22 23:39:51 alex Exp $
- * $Revision: 1.3 $
- * $Date: 2000/06/22 23:39:51 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/JNIEndpoint.java,v
1.3.2.1 2000/11/10 06:42:50 craigmcc Exp $
+ * $Revision: 1.3.2.1 $
+ * $Date: 2000/11/10 06:42:50 $
*
* ====================================================================
*
@@ -80,7 +80,7 @@
*/
public class JNIEndpoint {
- private StringManager sm =StringManager.getManager("org.apache.tomcat.service");
+ private static StringManager sm
=StringManager.getManager("org.apache.tomcat.service");
JNIConnectionHandler handler;
1.8.2.2 +4 -4
jakarta-tomcat/src/share/org/apache/tomcat/service/Attic/PoolTcpEndpoint.java
Index: PoolTcpEndpoint.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/Attic/PoolTcpEndpoint.java,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -r1.8.2.1 -r1.8.2.2
--- PoolTcpEndpoint.java 2000/10/04 20:23:54 1.8.2.1
+++ PoolTcpEndpoint.java 2000/11/10 06:42:50 1.8.2.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/Attic/PoolTcpEndpoint.java,v
1.8.2.1 2000/10/04 20:23:54 costin Exp $
- * $Revision: 1.8.2.1 $
- * $Date: 2000/10/04 20:23:54 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/Attic/PoolTcpEndpoint.java,v
1.8.2.2 2000/11/10 06:42:50 craigmcc Exp $
+ * $Revision: 1.8.2.2 $
+ * $Date: 2000/11/10 06:42:50 $
*
* ====================================================================
*
@@ -95,7 +95,7 @@
*/
public class PoolTcpEndpoint { // implements Endpoint {
- private StringManager sm =
StringManager.getManager("org.apache.tomcat.service");
+ private static StringManager sm =
StringManager.getManager("org.apache.tomcat.service");
private static final int BACKLOG = 100;
private static final int TIMEOUT = 1000;
1.4.2.2 +4 -4
jakarta-tomcat/src/share/org/apache/tomcat/service/Attic/SimpleTcpEndpoint.java
Index: SimpleTcpEndpoint.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/Attic/SimpleTcpEndpoint.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- SimpleTcpEndpoint.java 2000/07/27 18:16:22 1.4.2.1
+++ SimpleTcpEndpoint.java 2000/11/10 06:42:51 1.4.2.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/Attic/SimpleTcpEndpoint.java,v
1.4.2.1 2000/07/27 18:16:22 costin Exp $
- * $Revision: 1.4.2.1 $
- * $Date: 2000/07/27 18:16:22 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/Attic/SimpleTcpEndpoint.java,v
1.4.2.2 2000/11/10 06:42:51 craigmcc Exp $
+ * $Revision: 1.4.2.2 $
+ * $Date: 2000/11/10 06:42:51 $
*
* ====================================================================
*
@@ -94,7 +94,7 @@
*/
public class SimpleTcpEndpoint extends PoolTcpEndpoint {
- private StringManager sm =
StringManager.getManager("org.apache.tomcat.service");
+ private static StringManager sm =
StringManager.getManager("org.apache.tomcat.service");
private static final int BACKLOG = 100;
private static final int TIMEOUT = 5000;
1.11.2.2 +4 -4
jakarta-tomcat/src/share/org/apache/tomcat/service/Attic/TcpEndpoint.java
Index: TcpEndpoint.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/Attic/TcpEndpoint.java,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -r1.11.2.1 -r1.11.2.2
--- TcpEndpoint.java 2000/07/27 18:16:22 1.11.2.1
+++ TcpEndpoint.java 2000/11/10 06:42:51 1.11.2.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/Attic/TcpEndpoint.java,v
1.11.2.1 2000/07/27 18:16:22 costin Exp $
- * $Revision: 1.11.2.1 $
- * $Date: 2000/07/27 18:16:22 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/Attic/TcpEndpoint.java,v
1.11.2.2 2000/11/10 06:42:51 craigmcc Exp $
+ * $Revision: 1.11.2.2 $
+ * $Date: 2000/11/10 06:42:51 $
*
* ====================================================================
*
@@ -94,7 +94,7 @@
*/
public abstract class TcpEndpoint { // implements Endpoint {
- private StringManager sm =
StringManager.getManager("org.apache.tomcat.service");
+ private static StringManager sm =
StringManager.getManager("org.apache.tomcat.service");
private static final int BACKLOG = 100;
private static final int TIMEOUT = 1000;
No revision
No revision
1.28.2.2 +2 -2
jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Ajp12ConnectionHandler.java
Index: Ajp12ConnectionHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Ajp12ConnectionHandler.java,v
retrieving revision 1.28.2.1
retrieving revision 1.28.2.2
diff -u -r1.28.2.1 -r1.28.2.2
--- Ajp12ConnectionHandler.java 2000/10/05 06:28:29 1.28.2.1
+++ Ajp12ConnectionHandler.java 2000/11/10 06:42:51 1.28.2.2
@@ -80,7 +80,7 @@
/* Deprecated - must be rewriten to the connector model.
*/
public class Ajp12ConnectionHandler implements TcpConnectionHandler {
- StringManager sm = StringManager.getManager("org.apache.tomcat.service");
+ static StringManager sm = StringManager.getManager("org.apache.tomcat.service");
ContextManager contextM;
@@ -177,7 +177,7 @@
}
class AJP12RequestAdapter extends RequestImpl {
- StringManager sm = StringManager.getManager("org.apache.tomcat.service");
+ static StringManager sm = StringManager.getManager("org.apache.tomcat.service");
Socket socket;
InputStream sin;
Ajpv12InputStream ajpin;
1.9.2.1 +4 -4
jakarta-tomcat/src/share/org/apache/tomcat/service/connector/JNIConnectionHandler.java
Index: JNIConnectionHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/JNIConnectionHandler.java,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- JNIConnectionHandler.java 2000/06/12 09:45:22 1.9
+++ JNIConnectionHandler.java 2000/11/10 06:42:52 1.9.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/JNIConnectionHandler.java,v
1.9 2000/06/12 09:45:22 shachor Exp $
- * $Revision: 1.9 $
- * $Date: 2000/06/12 09:45:22 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/JNIConnectionHandler.java,v
1.9.2.1 2000/11/10 06:42:52 craigmcc Exp $
+ * $Revision: 1.9.2.1 $
+ * $Date: 2000/11/10 06:42:52 $
*
* ====================================================================
*
@@ -206,7 +206,7 @@
}
class JNIRequestAdapter extends RequestImpl {
- StringManager sm = StringManager.getManager("org.apache.tomcat.service");
+ static StringManager sm = StringManager.getManager("org.apache.tomcat.service");
ContextManager contextM;
boolean shutdown=false;
No revision
No revision
1.5.2.1 +4 -4
jakarta-tomcat/src/share/org/apache/tomcat/util/MessageBytes.java
Index: MessageBytes.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/MessageBytes.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- MessageBytes.java 2000/05/24 18:57:10 1.5
+++ MessageBytes.java 2000/11/10 06:42:52 1.5.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/MessageBytes.java,v 1.5
2000/05/24 18:57:10 costin Exp $
- * $Revision: 1.5 $
- * $Date: 2000/05/24 18:57:10 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/MessageBytes.java,v 1.5.2.1
2000/11/10 06:42:52 craigmcc Exp $
+ * $Revision: 1.5.2.1 $
+ * $Date: 2000/11/10 06:42:52 $
*
* ====================================================================
*
@@ -76,7 +76,7 @@
*/
public class MessageBytes {
- private StringManager sm =
+ private static StringManager sm =
StringManager.getManager("org.apache.tomcat.util");
/**
1.10.2.2 +4 -4
jakarta-tomcat/src/share/org/apache/tomcat/util/Attic/MimeHeaderField.java
Index: MimeHeaderField.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/Attic/MimeHeaderField.java,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -r1.10.2.1 -r1.10.2.2
--- MimeHeaderField.java 2000/11/10 02:59:39 1.10.2.1
+++ MimeHeaderField.java 2000/11/10 06:42:52 1.10.2.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/Attic/MimeHeaderField.java,v
1.10.2.1 2000/11/10 02:59:39 craigmcc Exp $
- * $Revision: 1.10.2.1 $
- * $Date: 2000/11/10 02:59:39 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/Attic/MimeHeaderField.java,v
1.10.2.2 2000/11/10 06:42:52 craigmcc Exp $
+ * $Revision: 1.10.2.2 $
+ * $Date: 2000/11/10 06:42:52 $
*
* ====================================================================
*
@@ -84,7 +84,7 @@
(byte)'5', (byte)'6', (byte)'7', (byte)'8', (byte)'9'
};
- private StringManager sm =
+ private static StringManager sm =
StringManager.getManager("org.apache.tomcat.util");
/**
1.9.2.1 +5 -5 jakarta-tomcat/src/share/org/apache/tomcat/util/MimeHeaders.java
Index: MimeHeaders.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/MimeHeaders.java,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- MimeHeaders.java 2000/06/23 02:16:30 1.9
+++ MimeHeaders.java 2000/11/10 06:42:52 1.9.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/MimeHeaders.java,v 1.9
2000/06/23 02:16:30 costin Exp $
- * $Revision: 1.9 $
- * $Date: 2000/06/23 02:16:30 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/MimeHeaders.java,v 1.9.2.1
2000/11/10 06:42:52 craigmcc Exp $
+ * $Revision: 1.9.2.1 $
+ * $Date: 2000/11/10 06:42:52 $
*
* ====================================================================
*
@@ -209,7 +209,7 @@
// Please avoid using any of the methods following this line.
// ( most of them will generate GC, or are http sepecific )
// ------------------------------------------------------------
- private StringManager sm =
+ private static StringManager sm =
StringManager.getManager("org.apache.tomcat.util");
int bufSize=512; // default
/**
@@ -489,7 +489,7 @@
}
class MimeHeadersEnumerator implements Enumeration {
- private StringManager sm =
+ private static StringManager sm =
StringManager.getManager("org.apache.tomcat.util");
private Hashtable hash;
private Enumeration delegate;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
