svn commit: r1342320 - in /tomcat/trunk/java/org/apache: coyote/http11/Http11NioProcessor.java tomcat/util/net/NioEndpoint.java

[kkolinko]

Author: kkolinko
Date: Thu May 24 16:22:29 2012
New Revision: 1342320

URL: http://svn.apache.org/viewvc?rev=1342320&view=rev
Log:
Simplify.
The "req" argument in processSendfile() is always true,  and it is no more used 
since r1340215

Modified:
    tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
    tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1342320&r1=1342319&r2=1342320&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Thu May 
24 16:22:29 2012
@@ -284,7 +284,7 @@ public class Http11NioProcessor extends 
                     socketWrapper.getSocket().getPoller().getSelector());
             //do the first write on this thread, might as well
             openSocket = 
socketWrapper.getSocket().getPoller().processSendfile(key,
-                    (KeyAttachment) socketWrapper, true, true);
+                    (KeyAttachment) socketWrapper, true);
             return true;
         }
         return false;

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1342320&r1=1342319&r2=1342320&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu May 24 
16:22:29 2012
@@ -1230,7 +1230,7 @@ public class NioEndpoint extends Abstrac
                     NioChannel channel = attachment.getChannel();
                     if (sk.isReadable() || sk.isWritable() ) {
                         if ( attachment.getSendfileData() != null ) {
-                            processSendfile(sk,attachment,true, false);
+                            processSendfile(sk,attachment, false);
                         } else if ( attachment.getComet() ) {
                             //check if thread is available
                             if ( isWorkerAvailable() ) {
@@ -1276,7 +1276,7 @@ public class NioEndpoint extends Abstrac
             return result;
         }
 
-        public boolean processSendfile(SelectionKey sk, KeyAttachment 
attachment, boolean reg, boolean event) {
+        public boolean processSendfile(SelectionKey sk, KeyAttachment 
attachment, boolean event) {
             NioChannel sc = null;
             try {
                 unreg(sk, attachment, sk.readyOps());



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org