Author: markt
Date: Thu Oct 27 15:24:41 2011
New Revision: 1189805
URL: http://svn.apache.org/viewvc?rev=1189805&view=rev
Log:
Work around a known JVM bug that is fixed in 1.7.0_01 but still present
in 1.6.0_29 and was triggering intermittent unit test failures for
org.apache.catalina.tribes.group.TestGroupChannelMemberArrival.testMemberArrival
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
tomcat/trunk/test/org/apache/catalina/tribes/test/NioSenderTest.java
tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketNioSend.java
tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketNioValidateSend.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java?rev=1189805&r1=1189804&r2=1189805&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
Thu Oct 27 15:24:41 2011
@@ -113,7 +113,12 @@ public class NioReceiver extends Receive
// Get the associated ServerSocket to bind it with
ServerSocket serverSocket = serverChannel.socket();
// create a new Selector for use below
- selector = Selector.open();
+ synchronized (Selector.class) {
+ // Selector.open() isn't thread safe
+ // http://bugs.sun.com/view_bug.do?bug_id=6427854
+ // Affects 1.6.0_29, fixed in 1.7.0_01
+ selector = Selector.open();
+ }
// set the port the server channel will listen to
//serverSocket.bind(new InetSocketAddress(getBind(),
getTcpListenPort()));
bind(serverSocket,getPort(),getAutoBind());
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java?rev=1189805&r1=1189804&r2=1189805&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
Thu Oct 27 15:24:41 2011
@@ -59,7 +59,12 @@ public class ParallelNioSender extends A
new HashMap<Member, NioSender>();
public ParallelNioSender() throws IOException {
- selector = Selector.open();
+ synchronized (Selector.class) {
+ // Selector.open() isn't thread safe
+ // http://bugs.sun.com/view_bug.do?bug_id=6427854
+ // Affects 1.6.0_29, fixed in 1.7.0_01
+ selector = Selector.open();
+ }
setConnected(true);
}
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=1189805&r1=1189804&r2=1189805&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu Oct 27
15:24:41 2011
@@ -919,7 +919,12 @@ public class NioEndpoint extends Abstrac
protected volatile int keyCount = 0;
public Poller() throws IOException {
- this.selector = Selector.open();
+ synchronized (Selector.class) {
+ // Selector.open() isn't thread safe
+ // http://bugs.sun.com/view_bug.do?bug_id=6427854
+ // Affects 1.6.0_29, fixed in 1.7.0_01
+ this.selector = Selector.open();
+ }
}
public int getKeyCount() { return keyCount; }
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java?rev=1189805&r1=1189804&r2=1189805&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java Thu Oct
27 15:24:41 2011
@@ -65,7 +65,12 @@ public class NioSelectorPool {
if (SHARED && SHARED_SELECTOR == null) {
synchronized ( NioSelectorPool.class ) {
if ( SHARED_SELECTOR == null ) {
- SHARED_SELECTOR = Selector.open();
+ synchronized (Selector.class) {
+ // Selector.open() isn't thread safe
+ // http://bugs.sun.com/view_bug.do?bug_id=6427854
+ // Affects 1.6.0_29, fixed in 1.7.0_01
+ SHARED_SELECTOR = Selector.open();
+ }
log.info("Using a shared selector for servlet write/read");
}
}
@@ -84,11 +89,26 @@ public class NioSelectorPool {
Selector s = null;
try {
s = selectors.size()>0?selectors.poll():null;
- if (s == null) s = Selector.open();
+ if (s == null) {
+ synchronized (Selector.class) {
+ // Selector.open() isn't thread safe
+ // http://bugs.sun.com/view_bug.do?bug_id=6427854
+ // Affects 1.6.0_29, fixed in 1.7.0_01
+ s = Selector.open();
+ }
+ }
else spare.decrementAndGet();
}catch (NoSuchElementException x ) {
- try {s = Selector.open();}catch (IOException iox){}
+ try {
+ synchronized (Selector.class) {
+ // Selector.open() isn't thread safe
+ // http://bugs.sun.com/view_bug.do?bug_id=6427854
+ // Affects 1.6.0_29, fixed in 1.7.0_01
+ s = Selector.open();
+ }
+ } catch (IOException iox) {
+ }
} finally {
if ( s == null ) active.decrementAndGet();//we were unable to find
a selector
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java?rev=1189805&r1=1189804&r2=1189805&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java Thu Oct
27 15:24:41 2011
@@ -239,7 +239,12 @@ public class SecureNioChannel extends Ni
default : {
long now = System.currentTimeMillis();
if (selector==null) {
- selector = Selector.open();
+ synchronized (Selector.class) {
+ // Selector.open() isn't thread safe
+ //
http://bugs.sun.com/view_bug.do?bug_id=6427854
+ // Affects 1.6.0_29, fixed in 1.7.0_01
+ selector = Selector.open();
+ }
key = getIOChannel().register(selector, hsStatus);
} else {
key.interestOps(hsStatus);
Modified: tomcat/trunk/test/org/apache/catalina/tribes/test/NioSenderTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/NioSenderTest.java?rev=1189805&r1=1189804&r2=1189805&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/test/NioSenderTest.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/test/NioSenderTest.java Thu
Oct 27 15:24:41 2011
@@ -60,7 +60,12 @@ public class NioSenderTest {
}
public void init() throws Exception {
- selector = Selector.open();
+ synchronized (Selector.class) {
+ // Selector.open() isn't thread safe
+ // http://bugs.sun.com/view_bug.do?bug_id=6427854
+ // Affects 1.6.0_29, fixed in 1.7.0_01
+ selector = Selector.open();
+ }
mbr = new MemberImpl("localhost",4444,0);
NioSender sender = new NioSender();
sender.setDestination(mbr);
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketNioSend.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketNioSend.java?rev=1189805&r1=1189804&r2=1189805&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketNioSend.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketNioSend.java
Thu Oct 27 15:24:41 2011
@@ -32,7 +32,13 @@ import org.apache.catalina.tribes.transp
public class SocketNioSend {
public static void main(String[] args) throws Exception {
- Selector selector = Selector.open();
+ Selector selector;
+ synchronized (Selector.class) {
+ // Selector.open() isn't thread safe
+ // http://bugs.sun.com/view_bug.do?bug_id=6427854
+ // Affects 1.6.0_29, fixed in 1.7.0_01
+ selector = Selector.open();
+ }
Member mbr = new MemberImpl("localhost", 9999, 0);
ChannelData data = new ChannelData();
data.setOptions(Channel.SEND_OPTIONS_BYTE_MESSAGE);
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketNioValidateSend.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketNioValidateSend.java?rev=1189805&r1=1189804&r2=1189805&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketNioValidateSend.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketNioValidateSend.java
Thu Oct 27 15:24:41 2011
@@ -30,7 +30,13 @@ import org.apache.catalina.tribes.transp
public class SocketNioValidateSend {
public static void main(String[] args) throws Exception {
- Selector selector = Selector.open();
+ Selector selector;
+ synchronized (Selector.class) {
+ // Selector.open() isn't thread safe
+ // http://bugs.sun.com/view_bug.do?bug_id=6427854
+ // Affects 1.6.0_29, fixed in 1.7.0_01
+ selector = Selector.open();
+ }
Member mbr = new MemberImpl("localhost", 9999, 0);
byte seq = 0;
byte[] buf = new byte[50000];
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
