Author: markt Date: Thu Dec 18 13:31:16 2014 New Revision: 1646456 URL: http://svn.apache.org/r1646456 Log: Simplify. NioChannel.getAttachment(boolean) was only ever called with a parameter of false.
Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/NioServletInputStream.java tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioChannel.java tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Propchange: tomcat/tc8.0.x/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Dec 18 13:31:16 2014 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1646420 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1646302,1646420 Modified: tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java?rev=1646456&r1=1646455&r2=1646456&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java Thu Dec 18 13:31:16 2014 @@ -61,7 +61,7 @@ public class AjpNioProcessor extends Abs protected void registerForEvent(boolean read, boolean write) { final NioChannel socket = socketWrapper.getSocket(); final NioEndpoint.KeyAttachment attach = - (NioEndpoint.KeyAttachment) socket.getAttachment(false); + (NioEndpoint.KeyAttachment) socket.getAttachment(); if (attach == null) { return; } @@ -83,7 +83,7 @@ public class AjpNioProcessor extends Abs // poller. Therefore, it needs to be reset once asycn processing has // finished. final NioEndpoint.KeyAttachment attach = - (NioEndpoint.KeyAttachment)socketWrapper.getSocket().getAttachment(false); + (NioEndpoint.KeyAttachment)socketWrapper.getSocket().getAttachment(); if (!getErrorState().isError() && attach != null && asyncStateMachine.isAsyncDispatching()) { long soTimeout = endpoint.getSoTimeout(); @@ -118,7 +118,7 @@ public class AjpNioProcessor extends Abs throws IOException { NioEndpoint.KeyAttachment att = - (NioEndpoint.KeyAttachment) socketWrapper.getSocket().getAttachment(false); + (NioEndpoint.KeyAttachment) socketWrapper.getSocket().getAttachment(); if ( att == null ) throw new IOException("Key must be cancelled"); ByteBuffer writeBuffer = @@ -186,7 +186,7 @@ public class AjpNioProcessor extends Abs } try { NioEndpoint.KeyAttachment att = - (NioEndpoint.KeyAttachment) socketWrapper.getSocket().getAttachment(false); + (NioEndpoint.KeyAttachment) socketWrapper.getSocket().getAttachment(); if ( att == null ) throw new IOException("Key must be cancelled."); nRead = pool.read(readBuffer, socketWrapper.getSocket(), selector, att.getTimeout()); Modified: tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1646456&r1=1646455&r2=1646456&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Thu Dec 18 13:31:16 2014 @@ -99,7 +99,7 @@ public class Http11NioProcessor extends long soTimeout = endpoint.getSoTimeout(); RequestInfo rp = request.getRequestProcessor(); - final NioEndpoint.KeyAttachment attach = (NioEndpoint.KeyAttachment)socketWrapper.getSocket().getAttachment(false); + final NioEndpoint.KeyAttachment attach = (NioEndpoint.KeyAttachment)socketWrapper.getSocket().getAttachment(); try { rp.setStage(org.apache.coyote.Constants.STAGE_SERVICE); if (!getAdapter().event(request, response, status)) { @@ -171,7 +171,7 @@ public class Http11NioProcessor extends @Override protected void resetTimeouts() { - final NioEndpoint.KeyAttachment attach = (NioEndpoint.KeyAttachment)socketWrapper.getSocket().getAttachment(false); + final NioEndpoint.KeyAttachment attach = (NioEndpoint.KeyAttachment)socketWrapper.getSocket().getAttachment(); if (!getErrorState().isError() && attach != null && asyncStateMachine.isAsyncDispatching()) { long soTimeout = endpoint.getSoTimeout(); @@ -481,7 +481,7 @@ public class Http11NioProcessor extends break; } case COMET_CLOSE: { - if (socketWrapper==null || socketWrapper.getSocket().getAttachment(false)==null) { + if (socketWrapper==null || socketWrapper.getSocket().getAttachment()==null) { return; } RequestInfo rp = request.getRequestProcessor(); @@ -497,10 +497,10 @@ public class Http11NioProcessor extends if (param==null) { return; } - if (socketWrapper==null || socketWrapper.getSocket().getAttachment(false)==null) { + if (socketWrapper==null || socketWrapper.getSocket().getAttachment()==null) { return; } - NioEndpoint.KeyAttachment attach = (NioEndpoint.KeyAttachment)socketWrapper.getSocket().getAttachment(false); + NioEndpoint.KeyAttachment attach = (NioEndpoint.KeyAttachment)socketWrapper.getSocket().getAttachment(); long timeout = ((Long)param).longValue(); //if we are not piggy backing on a worker thread, set the timeout RequestInfo rp = request.getRequestProcessor(); Modified: tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java?rev=1646456&r1=1646455&r2=1646456&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java Thu Dec 18 13:31:16 2014 @@ -126,7 +126,7 @@ public class InternalNioInputBuffer exte } try { NioEndpoint.KeyAttachment att = - (NioEndpoint.KeyAttachment) socket.getAttachment(false); + (NioEndpoint.KeyAttachment) socket.getAttachment(); if (att == null) { throw new IOException("Key must be cancelled."); } Modified: tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java?rev=1646456&r1=1646455&r2=1646456&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Thu Dec 18 13:31:16 2014 @@ -126,7 +126,7 @@ public class InternalNioOutputBuffer ext } int written = 0; - NioEndpoint.KeyAttachment att = (NioEndpoint.KeyAttachment)socket.getAttachment(false); + NioEndpoint.KeyAttachment att = (NioEndpoint.KeyAttachment)socket.getAttachment(); if ( att == null ) throw new IOException("Key must be cancelled"); long writeTimeout = att.getWriteTimeout(); Selector selector = null; @@ -203,7 +203,7 @@ public class InternalNioOutputBuffer ext } } - NioEndpoint.KeyAttachment ka = (NioEndpoint.KeyAttachment)socket.getAttachment(false); + NioEndpoint.KeyAttachment ka = (NioEndpoint.KeyAttachment)socket.getAttachment(); if (ka != null) ka.access();//prevent timeouts for just doing client writes if (!isBlocking() && length > 0) { @@ -275,7 +275,7 @@ public class InternalNioOutputBuffer ext @Override protected void registerWriteInterest() throws IOException { - NioEndpoint.KeyAttachment att = (NioEndpoint.KeyAttachment)socket.getAttachment(false); + NioEndpoint.KeyAttachment att = (NioEndpoint.KeyAttachment)socket.getAttachment(); if (att == null) { throw new IOException("Key must be cancelled"); } Modified: tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/NioServletInputStream.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/NioServletInputStream.java?rev=1646456&r1=1646455&r2=1646456&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/NioServletInputStream.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/NioServletInputStream.java Thu Dec 18 13:31:16 2014 @@ -119,7 +119,7 @@ public class NioServletInputStream exten } try { NioEndpoint.KeyAttachment att = - (NioEndpoint.KeyAttachment) channel.getAttachment(false); + (NioEndpoint.KeyAttachment) channel.getAttachment(); if (att == null) { throw new IOException("Key must be cancelled."); } Modified: tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java?rev=1646456&r1=1646455&r2=1646456&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java Thu Dec 18 13:31:16 2014 @@ -79,7 +79,7 @@ public class NioServletOutputStream exte int written = 0; NioEndpoint.KeyAttachment att = - (NioEndpoint.KeyAttachment) channel.getAttachment(false); + (NioEndpoint.KeyAttachment) channel.getAttachment(); if (att == null) { throw new IOException("Key must be cancelled"); } @@ -108,7 +108,7 @@ public class NioServletOutputStream exte @Override protected void doFlush() throws IOException { NioEndpoint.KeyAttachment att = - (NioEndpoint.KeyAttachment) channel.getAttachment(false); + (NioEndpoint.KeyAttachment) channel.getAttachment(); if (att == null) { throw new IOException("Key must be cancelled"); } Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioChannel.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioChannel.java?rev=1646456&r1=1646455&r2=1646456&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioChannel.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioChannel.java Thu Dec 18 13:31:16 2014 @@ -140,12 +140,11 @@ public class NioChannel implements ByteC return sc.read(dst); } - public Object getAttachment(boolean remove) { + public Object getAttachment() { Poller pol = getPoller(); Selector sel = pol!=null?pol.getSelector():null; SelectionKey key = sel!=null?getIOChannel().keyFor(sel):null; Object att = key!=null?key.attachment():null; - if (key != null && att != null && remove ) key.attach(null); return att; } Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1646456&r1=1646455&r2=1646456&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu Dec 18 13:31:16 2014 @@ -900,7 +900,7 @@ public class NioEndpoint extends Abstrac } addEvent(r); if (close) { - NioEndpoint.KeyAttachment ka = (NioEndpoint.KeyAttachment)socket.getAttachment(false); + NioEndpoint.KeyAttachment ka = (NioEndpoint.KeyAttachment)socket.getAttachment(); processSocket(ka, SocketStatus.STOP, false); } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org