[Crossfire-cvs] SF.net SVN: crossfire:[12232] jxclient/trunk/src/jxclient/com/realtime/ crossfire/jxclient/server/ClientSocket.java

[Crossfire C. r. messages. <cro...@li...>]

Revision: 12232
          http://crossfire.svn.sourceforge.net/crossfire/?rev=12232&view=rev
Author:   akirschbaum
Date:     2009-10-26 20:21:04 +0000 (Mon, 26 Oct 2009)

Log Message:
-----------
Do not display 'null' disconnect reason.

Modified Paths:
--------------
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/ClientSocket.java

Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/ClientSocket.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/ClientSocket.java	2009-10-24 22:51:43 UTC (rev 12231)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/server/ClientSocket.java	2009-10-26 20:21:04 UTC (rev 12232)
@@ -365,11 +365,13 @@
             }
             catch (final IOException ex)
             {
+                final String tmp = ex.getMessage();
+                final String message = tmp == null ? "I/O error" : tmp; 
                 if (debugProtocol != null)
                 {
-                    debugProtocol.debugProtocolWrite("socket:exception "+ex.getMessage(), ex);
+                    debugProtocol.debugProtocolWrite("socket:exception "+message, ex);
                 }
-                processDisconnect(ex.getMessage());
+                processDisconnect(message);
             }
         }
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.