Author: markt
Date: Fri Jun 13 18:53:38 2014
New Revision: 1602489
URL: http://svn.apache.org/r1602489
Log:
Pull up getLog() and add some supporting plumbing
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1602189
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1602489&r1=1602488&r2=1602489&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProcessor.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProcessor.java Fri Jun
13 18:53:38 2014
@@ -19,10 +19,12 @@ package org.apache.coyote;
import java.io.IOException;
import java.util.concurrent.Executor;
+import org.apache.juli.logging.Log;
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
import org.apache.tomcat.util.net.SocketStatus;
import org.apache.tomcat.util.net.SocketWrapper;
+import org.apache.tomcat.util.res.StringManager;
/**
* Provides functionality and attributes common to all supported protocols
@@ -30,6 +32,8 @@ import org.apache.tomcat.util.net.Socket
*/
public abstract class AbstractProcessor<S> implements ActionHook, Processor<S>
{
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);
+
protected Adapter adapter;
protected AsyncStateMachine<S> asyncStateMachine;
protected AbstractEndpoint endpoint;
@@ -191,4 +195,6 @@ public abstract class AbstractProcessor<
@Deprecated
@Override
public abstract org.apache.coyote.http11.upgrade.UpgradeInbound
getUpgradeInbound();
+
+ protected abstract Log getLog();
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java?rev=1602489&r1=1602488&r2=1602489&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
Fri Jun 13 18:53:38 2014
@@ -37,7 +37,6 @@ import org.apache.coyote.Request;
import org.apache.coyote.RequestInfo;
import org.apache.coyote.Response;
import org.apache.coyote.http11.upgrade.servlet31.HttpUpgradeHandler;
-import org.apache.juli.logging.Log;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.HexUtils;
@@ -55,9 +54,6 @@ import org.apache.tomcat.util.res.String
*/
public abstract class AbstractAjpProcessor<S> extends AbstractProcessor<S> {
- protected abstract Log getLog();
-
-
/**
* The string manager for this package.
*/
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1602489&r1=1602488&r2=1602489&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Fri Jun 13 18:53:38 2014
@@ -40,7 +40,6 @@ import org.apache.coyote.http11.filters.
import org.apache.coyote.http11.filters.VoidInputFilter;
import org.apache.coyote.http11.filters.VoidOutputFilter;
import org.apache.coyote.http11.upgrade.servlet31.HttpUpgradeHandler;
-import org.apache.juli.logging.Log;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.buf.Ascii;
import org.apache.tomcat.util.buf.ByteChunk;
@@ -57,7 +56,6 @@ import org.apache.tomcat.util.res.String
public abstract class AbstractHttp11Processor<S> extends AbstractProcessor<S> {
- protected abstract Log getLog();
private final UserDataHelper userDataHelper;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
