Author: markt
Date: Thu Jun 12 14:52:38 2014
New Revision: 1602189
URL: http://svn.apache.org/r1602189
Log:
Pull up getLog() and add some supporting plumbing
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1602189&r1=1602188&r2=1602189&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Thu Jun 12
14:52:38 2014
@@ -21,10 +21,12 @@ import java.util.concurrent.Executor;
import javax.servlet.http.HttpUpgradeHandler;
+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
@@ -32,6 +34,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 final AsyncStateMachine<S> asyncStateMachine;
protected final AbstractEndpoint<S> endpoint;
@@ -201,4 +205,6 @@ public abstract class AbstractProcessor<
* @param write Register the socket for write events
*/
protected abstract void registerForEvent(boolean read, boolean write);
+
+ protected abstract Log getLog();
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java?rev=1602189&r1=1602188&r2=1602189&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java Thu Jun
12 14:52:38 2014
@@ -42,7 +42,6 @@ import org.apache.coyote.OutputBuffer;
import org.apache.coyote.Request;
import org.apache.coyote.RequestInfo;
import org.apache.coyote.Response;
-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;
@@ -62,9 +61,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/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1602189&r1=1602188&r2=1602189&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Thu
Jun 12 14:52:38 2014
@@ -41,7 +41,6 @@ import org.apache.coyote.http11.filters.
import org.apache.coyote.http11.filters.SavedRequestInputFilter;
import org.apache.coyote.http11.filters.VoidInputFilter;
import org.apache.coyote.http11.filters.VoidOutputFilter;
-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;
@@ -59,7 +58,6 @@ import org.apache.tomcat.util.res.String
public abstract class AbstractHttp11Processor<S> extends AbstractProcessor<S> {
- protected abstract Log getLog();
private final UserDataHelper userDataHelper;
Modified: tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java?rev=1602189&r1=1602188&r2=1602189&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/spdy/SpdyProcessor.java Thu Jun 12
14:52:38 2014
@@ -33,6 +33,8 @@ import org.apache.coyote.OutputBuffer;
import org.apache.coyote.Request;
import org.apache.coyote.RequestInfo;
import org.apache.coyote.Response;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.spdy.SpdyConnection;
import org.apache.tomcat.spdy.SpdyContext;
import org.apache.tomcat.spdy.SpdyFrame;
@@ -57,6 +59,8 @@ import org.apache.tomcat.util.net.Socket
*/
public class SpdyProcessor<S> extends AbstractProcessor<S> implements Runnable
{
+ private static final Log log = LogFactory.getLog(SpdyProcessor.class);
+
// TODO: handle input
// TODO: recycle
// TODO: swallow input ( recycle only after input close )
@@ -630,4 +634,9 @@ public class SpdyProcessor<S> extends Ab
public HttpUpgradeHandler getHttpUpgradeHandler() {
return null;
}
+
+ @Override
+ protected Log getLog() {
+ return log;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
