Merge jdk8u20-b11

Wed, 16 Apr 2014 15:06:41 -0700

author
lana
date
Wed, 16 Apr 2014 15:06:41 -0700
changeset 647
9a6092124c7c
parent 644
1154d35e808d
parent 646
ff602d794259
child 648
673829390271
child 652
d88cf94e5723

Merge

     1.1 --- a/src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelAcceptorImpl.java	Wed Apr 16 12:32:16 2014 -0700
     1.2 +++ b/src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelAcceptorImpl.java	Wed Apr 16 15:06:41 2014 -0700
     1.3 @@ -253,6 +253,13 @@
     1.4              // registered with the selector.  Otherwise if the bytes
     1.5              // are read on the connection it will attempt a time stamp
     1.6              // but the cache will be null, resulting in NPE.
     1.7 +
     1.8 +            // A connection needs to be timestamped before putting to the cache.
     1.9 +            // Otherwise the newly created connection (with 0 timestamp) could be
    1.10 +            // incorrectly reclaimed by concurrent reclaim() call OR if there
    1.11 +            // will be no events on this connection then it could be reclaimed
    1.12 +            // by upcoming reclaim() call.
    1.13 +            getConnectionCache().stampTime(connection);
    1.14              getConnectionCache().put(this, connection);
    1.15  
    1.16              if (connection.shouldRegisterServerReadEvent()) {

mercurial