Author: jfrederic.clere(a)jboss.com
Date: 2008-09-17 12:12:44 -0400 (Wed, 17 Sep 2008)
New Revision: 1854
Modified:
trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/impl/DefaultMCMPHandler.java
Log:
Remove the INFO before the reset of the configuration.
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-17
16:08:13 UTC (rev 1853)
+++
trunk/mod_cluster/src/main/java/org/jboss/modcluster/mcmp/impl/DefaultMCMPHandler.java 2008-09-17
16:12:44 UTC (rev 1854)
@@ -459,33 +459,31 @@
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);
- this.sendRequest(MCMPUtils.getInfoRequest(), proxy);
-
- if (proxy.getState() == Proxy.State.OK)
+ if (sendResetRequests)
{
- // We recovered above; if we get another IOException
- // we should log it
- proxy.setIoExceptionLogged(false);
-
- if (sendResetRequests)
+ if (resetRequests == null)
{
- if (resetRequests == null)
- {
- resetRequests = this.resetRequestSource.getResetRequests();
- }
-
- for (MCMPRequest request: resetRequests)
- {
- this.sendRequest(request, proxy);
- }
+ resetRequests = this.resetRequestSource.getResetRequests();
}
+
+ for (MCMPRequest request: resetRequests)
+ {
+ this.sendRequest(request, proxy);
+ }
+ } else {
+ this.sendRequest(MCMPUtils.getInfoRequest(), proxy);
}
}
}
Show replies by date