[jetrix-cvs] SF.net SVN: jetrix:[753] jetrix/trunk/src/java/net/jetrix
Brought to you by:
smanux
From: <sm...@us...> - 2008-09-02 06:38:57
|
Revision: 753 http://jetrix.svn.sourceforge.net/jetrix/?rev=753&view=rev Author: smanux Date: 2008-09-02 06:38:53 +0000 (Tue, 02 Sep 2008) Log Message: ----------- Expected exceptions when the server is shutting down are no longer logged Modified Paths: -------------- jetrix/trunk/src/java/net/jetrix/clients/TetrinetClient.java jetrix/trunk/src/java/net/jetrix/listeners/ClientListener.java Modified: jetrix/trunk/src/java/net/jetrix/clients/TetrinetClient.java =================================================================== --- jetrix/trunk/src/java/net/jetrix/clients/TetrinetClient.java 2008-09-01 22:00:25 UTC (rev 752) +++ jetrix/trunk/src/java/net/jetrix/clients/TetrinetClient.java 2008-09-02 06:38:53 UTC (rev 753) @@ -151,14 +151,20 @@ } catch (IOException e) { - log.log(Level.SEVERE, e.getMessage(), e); + if (Server.getInstance().getConfig().isRunning()) + { + log.log(Level.SEVERE, "Connexion error with the tetrinet client '" + getUser().getName() + "'", e); + } } finally { - disconnect(); - try { in.close(); } catch (IOException e) { e.printStackTrace(); } - try { out.close(); } catch (IOException e) { e.printStackTrace(); } - try { socket.close(); } catch (IOException e) { e.printStackTrace(); } + if (!socket.isClosed()) + { + disconnect(); + try { in.close(); } catch (IOException e) { e.printStackTrace(); } + try { out.close(); } catch (IOException e) { e.printStackTrace(); } + try { socket.close(); } catch (IOException e) { e.printStackTrace(); } + } // unregister the client from the server ClientRepository.getInstance().removeClient(this); Modified: jetrix/trunk/src/java/net/jetrix/listeners/ClientListener.java =================================================================== --- jetrix/trunk/src/java/net/jetrix/listeners/ClientListener.java 2008-09-01 22:00:25 UTC (rev 752) +++ jetrix/trunk/src/java/net/jetrix/listeners/ClientListener.java 2008-09-02 06:38:53 UTC (rev 753) @@ -117,7 +117,11 @@ { ioe.printStackTrace(); } - e.printStackTrace(); + + if (Server.getInstance().getConfig().isRunning()) + { + e.printStackTrace(); + } } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |