sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed an NPE (apparently harmless) for a certain connection

Browse Source 
teardown ordering and added some logging just to be sure
the channels are getting closed.


git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7153 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
PSp..om 2011-04-01 21:33:13 +00:00
parent 50465e37b3
commit d3364b4622
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
engine/src/networking/com/jme3/network/kernel/tcp/SelectorKernel.java
View File

@ -112,7 +112,7 @@ public class SelectorKernel extends AbstractKernel
} }
} }
public void broadcast( Filter<? super Endpoint> filter, ByteBuffer data, boolean reliable, public void broadcast( Filter<? super Endpoint> filter, ByteBuffer data, boolean reliable,
boolean copy ) boolean copy )
{ {
if( !reliable ) if( !reliable )
@ -133,7 +133,7 @@ public class SelectorKernel extends AbstractKernel
continue; continue;
// Give it the data... but let each endpoint track their // Give it the data... but let each endpoint track their
// own completion over the shared array of bytes by // own completion over the shared array of bytes by
// duplicating it // duplicating it
p.send( data.duplicate(), false, false ); p.send( data.duplicate(), false, false );
} }
@ -164,7 +164,7 @@ public class SelectorKernel extends AbstractKernel
// Enqueue an endpoint event for the listeners // Enqueue an endpoint event for the listeners
addEvent( EndpointEvent.createRemove( this, p ) ); addEvent( EndpointEvent.createRemove( this, p ) );
// If there are no pending messages then add one so that the // If there are no pending messages then add one so that the
// kernel-user knows to wake up if it is only listening for // kernel-user knows to wake up if it is only listening for
// envelopes. // envelopes.
@ -174,7 +174,7 @@ public class SelectorKernel extends AbstractKernel
// to check again. // to check again.
addEnvelope( EVENTS_PENDING ); addEnvelope( EVENTS_PENDING );
} }
} }
/** /**
* Called by the endpoints when they need to be closed. * Called by the endpoints when they need to be closed.
@ -285,10 +285,10 @@ public class SelectorKernel extends AbstractKernel
// efficiently done as change requests... or simply // efficiently done as change requests... or simply
// keeping a thread-safe set of endpoints with pending // keeping a thread-safe set of endpoints with pending
// writes. For most cases, it shouldn't matter. // writes. For most cases, it shouldn't matter.
for( Map.Entry<NioEndpoint,SelectionKey> e : endpointKeys.entrySet() ) { for( Map.Entry<NioEndpoint,SelectionKey> e : endpointKeys.entrySet() ) {
if( e.getKey().hasPending() ) { if( e.getKey().hasPending() ) {
e.getValue().interestOps(SelectionKey.OP_WRITE); e.getValue().interestOps(SelectionKey.OP_WRITE);
} }
} }
} }
@ -318,7 +318,13 @@ public class SelectorKernel extends AbstractKernel
protected void cancel( NioEndpoint p ) throws IOException protected void cancel( NioEndpoint p ) throws IOException
{ {
log.log( Level.INFO, "Closing endpoint:{0}.", p );
SelectionKey key = endpointKeys.remove(p); SelectionKey key = endpointKeys.remove(p);
if( key == null ) {
log.log( Level.INFO, "Endpoint already closed:{0}.", p );
return; // already closed it
}
SocketChannel c = (SocketChannel)key.channel(); SocketChannel c = (SocketChannel)key.channel();
// Note: key.cancel() is specifically thread safe. One of // Note: key.cancel() is specifically thread safe. One of
@ -332,6 +338,7 @@ public class SelectorKernel extends AbstractKernel
protected void cancel( SelectionKey key, SocketChannel c ) throws IOException protected void cancel( SelectionKey key, SocketChannel c ) throws IOException
{ {
NioEndpoint p = (NioEndpoint)key.attachment(); NioEndpoint p = (NioEndpoint)key.attachment();
log.log( Level.INFO, "Closing channel endpoint:{0}.", p );
endpointKeys.remove(p); endpointKeys.remove(p);
key.cancel(); key.cancel();
@ -375,13 +382,13 @@ public class SelectorKernel extends AbstractKernel
if( current == NioEndpoint.CLOSE_MARKER ) { if( current == NioEndpoint.CLOSE_MARKER ) {
// This connection wants to be closed now // This connection wants to be closed now
closeEndpoint(p); closeEndpoint(p);
// Nothing more to do // Nothing more to do
return; return;
} }
c.write( current ); c.write( current );
// If we wrote all of that packet then we need to remove it // If we wrote all of that packet then we need to remove it
if( current.remaining() == 0 ) { if( current.remaining() == 0 ) {
p.removePending(); p.removePending();