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/07/05 09:22:33 UTC
svn commit: r553401 - in
/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio:
SocketAcceptor.java SocketConnector.java
Author: trustin
Date: Thu Jul 5 00:22:32 2007
New Revision: 553401
URL: http://svn.apache.org/viewvc?view=rev&rev=553401
Log:
Fixed DIRMINA-374 (ArrayIndexOutOfBoundException in SocketAcceptor and SocketConnector)
* Applied Srikanth Veeramachaneni's solution
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java?view=diff&rev=553401&r1=553400&r2=553401
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketAcceptor.java Thu Jul 5 00:22:32 2007
@@ -434,12 +434,12 @@
private SocketIoProcessor nextProcessor()
{
- if ( processorDistributor++ < 0 )
- {
- processorDistributor = 0;
- }
-
- return ioProcessors[processorDistributor % processorCount];
+ if ( this.processorDistributor == Integer.MAX_VALUE )
+ {
+ this.processorDistributor = Integer.MAX_VALUE % this.processorCount;
+ }
+
+ return ioProcessors[processorDistributor++ % processorCount];
}
private void registerNew()
Modified: mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java?view=diff&rev=553401&r1=553400&r2=553401
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/SocketConnector.java Thu Jul 5 00:22:32 2007
@@ -349,12 +349,12 @@
private SocketIoProcessor nextProcessor()
{
- if ( processorDistributor++ < 0 )
- {
- processorDistributor = 0;
- }
-
- return ioProcessors[processorDistributor % processorCount];
+ if ( this.processorDistributor == Integer.MAX_VALUE )
+ {
+ this.processorDistributor = Integer.MAX_VALUE % this.processorCount;
+ }
+
+ return ioProcessors[processorDistributor++ % processorCount];
}
private class Worker implements Runnable