Browse Source

Modified to log and continue when the message/event
dispatch throws exceptions. This protects the server
from dying just because of a bad listener.


git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7125 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

PSp..om 14 years ago
parent
commit
f7f47a13e4
1 changed files with 24 additions and 6 deletions
  1. 24 6
      engine/src/networking/com/jme3/network/base/KernelAdapter.java

+ 24 - 6
engine/src/networking/com/jme3/network/base/KernelAdapter.java

@@ -35,6 +35,8 @@ package com.jme3.network.base;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import com.jme3.network.*;
 import com.jme3.network.kernel.Endpoint;
@@ -61,6 +63,8 @@ import com.jme3.network.serializing.Serializer;
  */
 public class KernelAdapter extends Thread
 {
+    static Logger log = Logger.getLogger(KernelAdapter.class.getName());
+    
     private DefaultServer server; // this is unfortunate
     private Kernel kernel;
     private MessageListener messageDispatcher;
@@ -89,6 +93,13 @@ public class KernelAdapter extends Thread
         kernel.terminate();
     }
 
+    protected void reportError( Exception e )
+    {
+        // Should really be queued up so the outer thread can
+        // retrieve them.  For now we'll just log it.  FIXME
+        log.log( Level.SEVERE, "Unhandled error", e );
+    }
+
     protected HostedConnection getConnection( Endpoint p )
     {
         return server.getConnection(p);
@@ -128,9 +139,13 @@ public class KernelAdapter extends Thread
             server.registerClient( this, p, (ClientRegistrationMessage)m );
             return;           
         }                
-            
-        HostedConnection source = getConnection(p);
-        messageDispatcher.messageReceived( source, m );
+ 
+        try {           
+            HostedConnection source = getConnection(p);
+            messageDispatcher.messageReceived( source, m );
+        } catch( Exception e ) {
+            reportError(e);
+        }
     }
 
     protected void createAndDispatch( Envelope env )
@@ -163,10 +178,13 @@ public class KernelAdapter extends Thread
     protected void flushEvents()
     {
         EndpointEvent event;
-        while( (event = kernel.nextEvent()) != null )
-            {
-            createAndDispatch( event );
+        while( (event = kernel.nextEvent()) != null ) {
+            try {
+                createAndDispatch( event );
+            } catch( Exception e ) {
+                reportError(e);        
             }
+        }
     }
  
     public void run()