You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tr...@apache.org on 2007/11/05 20:01:21 UTC

svn commit: r592118 - in /mina: branches/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/ branches/1.1/core/src/main/java/org/apache/mina/transport/socket/nio/ trunk/core/src/main/java/org/apache/mina/common/

Author: trustin
Date: Mon Nov  5 11:01:19 2007
New Revision: 592118

URL: http://svn.apache.org/viewvc?rev=592118&view=rev
Log:
Tiny optimization on read spinning


Modified:
    mina/branches/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java
    mina/branches/1.1/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java
    mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoProcessor.java

Modified: mina/branches/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java
URL: http://svn.apache.org/viewvc/mina/branches/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java?rev=592118&r1=592117&r2=592118&view=diff
==============================================================================
--- mina/branches/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java (original)
+++ mina/branches/1.0/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java Mon Nov  5 11:01:19 2007
@@ -248,7 +248,7 @@
                     while ((ret = ch.read(buf.buf())) > 0) {
                         readBytes += ret;
                     }
-                    if (readBytes != 0) {
+                    if (readBytes != 0 || ret < 0) {
                         break;
                     }
                 }

Modified: mina/branches/1.1/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java
URL: http://svn.apache.org/viewvc/mina/branches/1.1/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java?rev=592118&r1=592117&r2=592118&view=diff
==============================================================================
--- mina/branches/1.1/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java (original)
+++ mina/branches/1.1/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java Mon Nov  5 11:01:19 2007
@@ -212,7 +212,7 @@
                     while ((ret = ch.read(buf.buf())) > 0) {
                         readBytes += ret;
                     }
-                    if (readBytes != 0) {
+                    if (readBytes != 0 || ret < 0) {
                         break;
                     }
                 }

Modified: mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoProcessor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoProcessor.java?rev=592118&r1=592117&r2=592118&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoProcessor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/AbstractIoProcessor.java Mon Nov  5 11:01:19 2007
@@ -297,7 +297,7 @@
                         while ((ret = read(session, buf)) > 0) {
                             readBytes += ret;
                         }
-                        if (readBytes != 0) {
+                        if (readBytes != 0 || ret < 0) {
                             break;
                         }
                     }