Author: markt Date: Thu Jan 8 13:09:42 2015 New Revision: 1650267 URL: http://svn.apache.org/r1650267 Log: Move ByteBufferHolder so it can be used by SocketWrapper
Added: tomcat/trunk/java/org/apache/tomcat/util/buf/ByteBufferHolder.java (contents, props changed) - copied, changed from r1650266, tomcat/trunk/java/org/apache/coyote/ByteBufferHolder.java Removed: tomcat/trunk/java/org/apache/coyote/ByteBufferHolder.java Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1650267&r1=1650266&r2=1650267&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Thu Jan 8 13:09:42 2015 @@ -35,7 +35,6 @@ import javax.servlet.http.HttpUpgradeHan import org.apache.coyote.AbstractProcessor; import org.apache.coyote.ActionCode; import org.apache.coyote.AsyncContextCallback; -import org.apache.coyote.ByteBufferHolder; import org.apache.coyote.ErrorState; import org.apache.coyote.InputBuffer; import org.apache.coyote.OutputBuffer; @@ -45,6 +44,7 @@ import org.apache.coyote.Response; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; import org.apache.tomcat.util.ExceptionUtils; +import org.apache.tomcat.util.buf.ByteBufferHolder; import org.apache.tomcat.util.buf.ByteChunk; import org.apache.tomcat.util.buf.HexUtils; import org.apache.tomcat.util.buf.MessageBytes; Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java?rev=1650267&r1=1650266&r2=1650267&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java Thu Jan 8 13:09:42 2015 @@ -24,12 +24,12 @@ import java.util.Iterator; import java.util.concurrent.LinkedBlockingDeque; import org.apache.coyote.ActionCode; -import org.apache.coyote.ByteBufferHolder; import org.apache.coyote.OutputBuffer; import org.apache.coyote.Response; import org.apache.coyote.http11.filters.GzipOutputFilter; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; +import org.apache.tomcat.util.buf.ByteBufferHolder; import org.apache.tomcat.util.buf.ByteChunk; import org.apache.tomcat.util.buf.MessageBytes; import org.apache.tomcat.util.http.HttpMessages; Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java?rev=1650267&r1=1650266&r2=1650267&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java Thu Jan 8 13:09:42 2015 @@ -23,10 +23,10 @@ import java.util.Iterator; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock; -import org.apache.coyote.ByteBufferHolder; import org.apache.coyote.Response; import org.apache.tomcat.jni.Socket; import org.apache.tomcat.jni.Status; +import org.apache.tomcat.util.buf.ByteBufferHolder; import org.apache.tomcat.util.net.AbstractEndpoint; import org.apache.tomcat.util.net.AprEndpoint; import org.apache.tomcat.util.net.SocketWrapperBase; Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java?rev=1650267&r1=1650266&r2=1650267&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Thu Jan 8 13:09:42 2015 @@ -23,8 +23,8 @@ import java.nio.channels.SelectionKey; import java.nio.channels.Selector; import java.util.Iterator; -import org.apache.coyote.ByteBufferHolder; import org.apache.coyote.Response; +import org.apache.tomcat.util.buf.ByteBufferHolder; import org.apache.tomcat.util.net.NioChannel; import org.apache.tomcat.util.net.NioEndpoint; import org.apache.tomcat.util.net.NioSelectorPool; Copied: tomcat/trunk/java/org/apache/tomcat/util/buf/ByteBufferHolder.java (from r1650266, tomcat/trunk/java/org/apache/coyote/ByteBufferHolder.java) URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/ByteBufferHolder.java?p2=tomcat/trunk/java/org/apache/tomcat/util/buf/ByteBufferHolder.java&p1=tomcat/trunk/java/org/apache/coyote/ByteBufferHolder.java&r1=1650266&r2=1650267&rev=1650267&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/ByteBufferHolder.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/buf/ByteBufferHolder.java Thu Jan 8 13:09:42 2015 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.coyote; +package org.apache.tomcat.util.buf; import java.nio.ByteBuffer; import java.util.concurrent.atomic.AtomicBoolean; Propchange: tomcat/trunk/java/org/apache/tomcat/util/buf/ByteBufferHolder.java ------------------------------------------------------------------------------ svn:eol-style = native --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org