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 2006/11/27 11:01:53 UTC
svn commit: r479567 - in /mina/branches:
1.0/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java
1.1/core/src/main/java/org/apache/mina/transport/socket/nio/SocketIoProcessor.java
Author: trustin
Date: Mon Nov 27 02:01:51 2006
New Revision: 479567
URL: http://svn.apache.org/viewvc?view=rev&rev=479567
Log:
Resolved issue: DIRMINA-308 (NullPointerException in SocketIoProcessor under heavy load)
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
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?view=diff&rev=479567&r1=479566&r2=479567
==============================================================================
--- 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 27 02:01:51 2006
@@ -74,15 +74,12 @@
}
startupWorker();
-
- selector.wakeup();
}
void remove( SocketSessionImpl session ) throws IOException
{
scheduleRemove( session );
startupWorker();
- selector.wakeup();
}
private void startupWorker() throws IOException
@@ -95,6 +92,7 @@
worker = new Worker();
executor.execute( new NamePreservingRunnable( worker ) );
}
+ selector.wakeup();
}
}
@@ -608,4 +606,4 @@
}
}
-}
\ No newline at end of file
+}
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?view=diff&rev=479567&r1=479566&r2=479567
==============================================================================
--- 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 27 02:01:51 2006
@@ -66,17 +66,13 @@
void addNew( SocketSessionImpl session ) throws IOException
{
newSessions.add( session );
-
startupWorker();
-
- selector.wakeup();
}
void remove( SocketSessionImpl session ) throws IOException
{
scheduleRemove( session );
startupWorker();
- selector.wakeup();
}
private void startupWorker() throws IOException
@@ -89,6 +85,7 @@
worker = new Worker();
executor.execute( new NamePreservingRunnable( worker ) );
}
+ selector.wakeup();
}
}
@@ -552,4 +549,4 @@
}
}
-}
\ No newline at end of file
+}