Author: jfrederic.clere(a)jboss.com Date: 2008-09-18 03:50:43 -0400 (Thu, 18 Sep 2008) New Revision: 1865 Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/impl/DefaultMCMPHandler.java Log: Rollback r1854 It would log each timer event when we don't have a connection to httpd. Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/impl/DefaultMCMPHandler.java =================================================================== --- trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/impl/DefaultMCMPHandler.java 2008-09-18 07:49:10 UTC (rev 1864) +++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/impl/DefaultMCMPHandler.java 2008-09-18 07:50:43 UTC (rev 1865) @@ -459,31 +459,33 @@ lock.lock(); try - { - // Reset the node information after an error. + { for (Proxy proxy: this.proxies) { if (proxy.getState() == Proxy.State.ERROR) { proxy.setState(Proxy.State.OK); - - // We recovered above; if we get another IOException - // we should log it - proxy.setIoExceptionLogged(false); - if (sendResetRequests) + this.sendRequest(MCMPUtils.getInfoRequest(), proxy); + + if (proxy.getState() == Proxy.State.OK) { - if (resetRequests == null) + // We recovered above; if we get another IOException + // we should log it + proxy.setIoExceptionLogged(false); + + if (sendResetRequests) { - resetRequests = this.resetRequestSource.getResetRequests(); + if (resetRequests == null) + { + resetRequests = this.resetRequestSource.getResetRequests(); + } + + for (MCMPRequest request: resetRequests) + { + this.sendRequest(request, proxy); + } } - - for (MCMPRequest request: resetRequests) - { - this.sendRequest(request, proxy); - } - } else { - this.sendRequest(MCMPUtils.getInfoRequest(), proxy); } } }