Author: markt
Date: Mon Oct 2 17:29:57 2006
New Revision: 452284
URL: http://svn.apache.org/viewvc?view=rev&rev=452284
Log:
Remove unused code in o.a.c.valves
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/FastCommonAccessLogValve.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/JDBCAccessLogValve.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/PersistentValve.java
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/FastCommonAccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/FastCommonAccessLogValve.java?view=diff&rev=452284&r1=452283&r2=452284
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/FastCommonAccessLogValve.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/FastCommonAccessLogValve.java
Mon Oct 2 17:29:57 2006
@@ -115,14 +115,6 @@
/**
- * If the current log pattern is the same as the common access log
- * format pattern, then we'll set this variable to true and log in
- * a more optimal and hard-coded way.
- */
- private boolean common = false;
-
-
- /**
* For the combined format (common, plus useragent and referer), we do
* the same
*/
@@ -249,12 +241,6 @@
* Resolve hosts.
*/
private boolean resolveHosts = false;
-
-
- /**
- * Instant when the log daily rotation was last checked.
- */
- private long rotationLastChecked = 0L;
/**
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/JDBCAccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/JDBCAccessLogValve.java?view=diff&rev=452284&r1=452283&r2=452284
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/JDBCAccessLogValve.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/JDBCAccessLogValve.java
Mon Oct 2 17:29:57 2006
@@ -453,20 +453,7 @@
if(bytes < 0)
bytes = 0;
int status = response.getStatus();
- if (pattern.equals("combined")) {
- String virtualHost = "";
- if(request != null)
- virtualHost = request.getServerName();
- String method = "";
- if(request != null)
- method = request.getMethod();
- String referer = "";
- if(request != null)
- referer = request.getHeader("referer");
- String userAgent = "";
- if(request != null)
- userAgent = request.getHeader("user-agent");
- }
+
synchronized (this) {
int numberOfTries = 2;
while (numberOfTries>0) {
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/PersistentValve.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/PersistentValve.java?view=diff&rev=452284&r1=452283&r2=452284
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/PersistentValve.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/valves/PersistentValve.java
Mon Oct 2 17:29:57 2006
@@ -29,7 +29,6 @@
import org.apache.catalina.Store;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
-import org.apache.catalina.core.StandardHost;
import org.apache.catalina.session.PersistentManager;
import org.apache.catalina.util.StringManager;
@@ -96,7 +95,6 @@
throws IOException, ServletException {
// Select the Context to be used for this Request
- StandardHost host = (StandardHost) getContainer();
Context context = request.getContext();
if (context == null) {
response.sendError
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
