Author: markt
Date: Wed Aug 28 10:17:00 2013
New Revision: 1518143
URL: http://svn.apache.org/r1518143
Log:
Refactoring. Make the log instance available to the super class. Use imports
rather than fully-qualified names.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java?rev=1518143&r1=1518142&r2=1518143&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java Wed Aug
28 10:17:00 2013
@@ -20,6 +20,7 @@ import java.io.IOException;
import org.apache.coyote.InputBuffer;
import org.apache.coyote.Request;
+import org.apache.juli.logging.Log;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.http.MimeHeaders;
import org.apache.tomcat.util.net.AbstractEndpoint;
@@ -249,6 +250,8 @@ public abstract class AbstractInputBuffe
*/
protected abstract int nbRead() throws IOException;
+ protected abstract Log getLog();
+
// --------------------------------------------------------- Public Methods
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java?rev=1518143&r1=1518142&r2=1518143&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java Wed
Aug 28 10:17:00 2013
@@ -641,6 +641,12 @@ public class InternalAprInputBuffer exte
}
+ @Override
+ protected final Log getLog() {
+ return log;
+ }
+
+
private int doReadSocket(boolean block) {
Lock readLock = wrapper.getBlockingStatusReadLock();
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java?rev=1518143&r1=1518142&r2=1518143&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java Wed Aug
28 10:17:00 2013
@@ -561,6 +561,12 @@ public class InternalInputBuffer extends
}
+ @Override
+ protected final Log getLog() {
+ return log;
+ }
+
+
// ------------------------------------- InputStreamInputBuffer Inner Class
/**
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java?rev=1518143&r1=1518142&r2=1518143&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java Wed
Aug 28 10:17:00 2013
@@ -23,6 +23,8 @@ import java.nio.charset.StandardCharsets
import org.apache.coyote.InputBuffer;
import org.apache.coyote.Request;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.MessageBytes;
import org.apache.tomcat.util.net.AbstractEndpoint;
@@ -40,8 +42,8 @@ import org.apache.tomcat.util.net.Socket
*/
public class InternalNioInputBuffer extends AbstractInputBuffer<NioChannel> {
- private static final org.apache.juli.logging.Log log =
-
org.apache.juli.logging.LogFactory.getLog(InternalNioInputBuffer.class);
+ private static final Log log =
+ LogFactory.getLog(InternalNioInputBuffer.class);
// -------------------------------------------------------------- Constants
@@ -184,6 +186,12 @@ public class InternalNioInputBuffer exte
}
+ @Override
+ protected final Log getLog() {
+ return log;
+ }
+
+
/**
* Recycle the input buffer. This should be called when closing the
* connection.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
