Author: markt
Date: Sun Nov 8 16:53:11 2015
New Revision: 1713253
URL: http://svn.apache.org/viewvc?rev=1713253&view=rev
Log:
Pull up getLog()
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1713253&r1=1713252&r2=1713253&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Sun Nov 8
16:53:11 2015
@@ -646,8 +646,6 @@ public abstract class AbstractProtocol<S
protected abstract static class AbstractConnectionHandler<S,P extends
Processor>
implements AbstractEndpoint.Handler<S> {
- protected abstract Log getLog();
-
protected final RequestGroupInfo global = new RequestGroupInfo();
protected final AtomicLong registerCount = new AtomicLong(0);
@@ -657,9 +655,11 @@ public abstract class AbstractProtocol<S
protected final RecycledProcessors<P,S> recycledProcessors =
new RecycledProcessors<>(this);
-
protected abstract AbstractProtocol<S> getProtocol();
+ protected Log getLog() {
+ return getProtocol().getLog();
+ }
@Override
public Object getGlobal() {
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1713253&r1=1713252&r2=1713253&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Sun Nov 8
16:53:11 2015
@@ -21,7 +21,6 @@ import java.nio.ByteBuffer;
import org.apache.coyote.AbstractProtocol;
import org.apache.coyote.UpgradeProtocol;
import org.apache.coyote.UpgradeToken;
-import org.apache.juli.logging.Log;
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.SSLHostConfig;
import org.apache.tomcat.util.net.SocketWrapperBase;
@@ -195,10 +194,5 @@ public abstract class AbstractAjpProtoco
// TODO should fail - throw IOE
return null;
}
-
- @Override
- protected Log getLog() {
- return proto.getLog();
- }
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1713253&r1=1713252&r2=1713253&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Sun
Nov 8 16:53:11 2015
@@ -38,7 +38,6 @@ import org.apache.coyote.UpgradeToken;
import org.apache.coyote.http11.upgrade.InternalHttpUpgradeHandler;
import org.apache.coyote.http11.upgrade.UpgradeProcessorExternal;
import org.apache.coyote.http11.upgrade.UpgradeProcessorInternal;
-import org.apache.juli.logging.Log;
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.SSLHostConfig;
import org.apache.tomcat.util.net.SocketWrapperBase;
@@ -676,11 +675,5 @@ public abstract class AbstractHttp11Prot
return new UpgradeProcessorExternal(socket, leftoverInput,
upgradeToken);
}
}
-
-
- @Override
- protected Log getLog() {
- return proto.getLog();
- }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
