[jbossnative-commits] JBoss Native SVN: r2287 - in trunk/mod_cluster/src/main/java/org/jboss/modcluster: advertise and 1 other directories.

Author: pferraro Date: 2009-02-12 16:18:30 -0500 (Thu, 12 Feb 2009) New Revision: 2287 Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/CatalinaEventHandler.java trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/AdvertiseListener.java trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/impl/AdvertiseListenerImpl.java Log: Handler IOException within AdvertiseListener.destroy() Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/CatalinaEventHandler.java =================================================================== --- trunk/mod_cluster/src/main/java/org/jboss/modcluster/CatalinaEventHandler.java 2009-02-12 21:01:48 UTC (rev 2286) +++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/CatalinaEventHandler.java 2009-02-12 21:18:30 UTC (rev 2287) @@ -147,14 +147,7 @@ if (this.advertiseListener != null) { - try - { - this.advertiseListener.destroy(); - } - catch (IOException e) - { - log.error(this.sm.getString("modcluster.error.stopListener"), e); - } + this.advertiseListener.destroy(); this.advertiseListener = null; } Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/AdvertiseListener.java =================================================================== --- trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/AdvertiseListener.java 2009-02-12 21:01:48 UTC (rev 2286) +++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/AdvertiseListener.java 2009-02-12 21:18:30 UTC (rev 2287) @@ -54,5 +54,5 @@ /** * Deallocate listener and close sockets. */ - void destroy() throws IOException; + void destroy(); } \ No newline at end of file Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/impl/AdvertiseListenerImpl.java =================================================================== --- trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/impl/AdvertiseListenerImpl.java 2009-02-12 21:01:48 UTC (rev 2286) +++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/advertise/impl/AdvertiseListenerImpl.java 2009-02-12 21:18:30 UTC (rev 2287) @@ -334,13 +334,21 @@ * @{inheritDoc} * @see org.jboss.modcluster.advertise.AdvertiseListener#destroy() */ - public void destroy() throws IOException + public void destroy() { this.stop(); if (this.initialized) { - this.socket.leaveGroup(this.groupAddress); + try + { + this.socket.leaveGroup(this.groupAddress); + } + catch (IOException e) + { + log.warn(e.getMessage(), e); + } + this.socket.close(); this.initialized = false; this.socket = null;