[patch] fix for bug

54086-2.patch (text/plain), 3.30 KB, created by Casey Lucas on 2013-06-26 20:17:54 UTC

(hide)

Description: fix for bug

Filename:

MIME Type:

Creator: Casey Lucas

Created: 2013-06-26 20:17:54 UTC

Size: 3.30 KB

patch

obsolete

>Index: java/org/apache/catalina/tribes/transport/nio/NioReceiver.java >=================================================================== >--- java/org/apache/catalina/tribes/transport/nio/NioReceiver.java (revision 1496923) >+++ java/org/apache/catalina/tribes/transport/nio/NioReceiver.java (working copy) >@@ -27,6 +27,7 @@ > import java.nio.channels.Selector; > import java.nio.channels.ServerSocketChannel; > import java.nio.channels.SocketChannel; >+import java.util.ConcurrentModificationException; > import java.util.Iterator; > import java.util.LinkedList; > import java.util.Set; >@@ -378,18 +379,46 @@ > Selector selector = this.selector.getAndSet(null); > if (selector==null) return; > try { >- Iterator<SelectionKey> it = selector.keys().iterator(); >- // look at each key in the selected set >- while (it.hasNext()) { >- SelectionKey key = it.next(); >- key.channel().close(); >- key.attach(null); >- key.cancel(); >- } >- }catch ( IOException ignore ){ >- if (log.isWarnEnabled()) { >- log.warn("Unable to cleanup on selector close.",ignore); >- } >+ int closeAttempt = 1; >+ int maxCloseAttempts = 3; >+ boolean goodClose = false; >+ do { >+ try { >+ // attempt to close known keys/channels >+ Iterator<SelectionKey> it = selector.keys().iterator(); >+ >+ // in order to see a ConcurrentModificationException thrown >+ // it is helpful to sleep after obtaining the key set iterator >+ //try { >+ // System.err.println("sleeping..."); >+ // Thread.sleep(2000); >+ //} catch (InterruptedException ignore) {} >+ >+ while (it.hasNext()) { >+ SelectionKey key = it.next(); >+ try { >+ key.channel().close(); >+ } catch (IOException ignore) { >+ if (log.isWarnEnabled()) { >+ log.warn("Unable to cleanup on selector close.",ignore); >+ } >+ } >+ key.attach(null); >+ key.cancel(); >+ } >+ goodClose = true; >+ } catch (ConcurrentModificationException concurrentException) { >+ // This will occur when another thread is processing closed >+ // connections because when connections are closed, the >+ // associated channel is closed and the key is canceled. >+ // See concurrency notes for Selector. >+ if (log.isDebugEnabled()) { >+ log.debug("Caught exception during close attempt " + closeAttempt + " of " + >+ maxCloseAttempts + ". Retrying.", concurrentException); >+ } >+ try { Thread.sleep(100 * closeAttempt); } catch(InterruptedException ignore) {} >+ } >+ } while (!goodClose && closeAttempt++ < maxCloseAttempts); > }catch ( ClosedSelectorException ignore){} > selector.close(); > } View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]