Author: jfrederic.clere(a)jboss.com Date: 2010-12-06 07:24:17 -0500 (Mon, 06 Dec 2010) New Revision: 1603 Modified: trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java trunk/java/org/apache/coyote/ajp/AjpProtocol.java trunk/java/org/apache/coyote/http11/Http11AprProtocol.java trunk/java/org/apache/coyote/http11/Http11Protocol.java Log: Fix for JBWEB-186. Modified: trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java =================================================================== --- trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java 2010-12-06 11:54:20 UTC (rev 1602) +++ trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java 2010-12-06 12:24:17 UTC (rev 1603) @@ -216,6 +216,7 @@ boolean done = false; while (!done && retry < org.apache.coyote.Constants.MAX_PAUSE_WAIT) { retry++; + done = true; for (int i = 0; i < states.length; i++) { if (states[i].getStage() == org.apache.coyote.Constants.STAGE_SERVICE) { try { @@ -223,10 +224,10 @@ } catch (InterruptedException e) { ; } - continue; + done = false; + break; } } - done = true; } if (log.isInfoEnabled()) log.info(sm.getString("ajpprotocol.pause", getName())); Modified: trunk/java/org/apache/coyote/ajp/AjpProtocol.java =================================================================== --- trunk/java/org/apache/coyote/ajp/AjpProtocol.java 2010-12-06 11:54:20 UTC (rev 1602) +++ trunk/java/org/apache/coyote/ajp/AjpProtocol.java 2010-12-06 12:24:17 UTC (rev 1603) @@ -216,6 +216,7 @@ boolean done = false; while (!done && retry < org.apache.coyote.Constants.MAX_PAUSE_WAIT) { retry++; + done = true; for (int i = 0; i < states.length; i++) { if (states[i].getStage() == org.apache.coyote.Constants.STAGE_SERVICE) { try { @@ -223,10 +224,10 @@ } catch (InterruptedException e) { ; } - continue; + done = false; + break; } } - done = true; } if (log.isInfoEnabled()) log.info(sm.getString("ajpprotocol.pause", getName())); Modified: trunk/java/org/apache/coyote/http11/Http11AprProtocol.java =================================================================== --- trunk/java/org/apache/coyote/http11/Http11AprProtocol.java 2010-12-06 11:54:20 UTC (rev 1602) +++ trunk/java/org/apache/coyote/http11/Http11AprProtocol.java 2010-12-06 12:24:17 UTC (rev 1603) @@ -164,6 +164,7 @@ boolean done = false; while (!done && retry < org.apache.coyote.Constants.MAX_PAUSE_WAIT) { retry++; + done = true; for (int i = 0; i < states.length; i++) { if (states[i].getStage() == org.apache.coyote.Constants.STAGE_SERVICE) { try { @@ -171,10 +172,10 @@ } catch (InterruptedException e) { ; } - continue; + done = false; + break; } } - done = true; } if(log.isInfoEnabled()) log.info(sm.getString("http11protocol.pause", getName())); Modified: trunk/java/org/apache/coyote/http11/Http11Protocol.java =================================================================== --- trunk/java/org/apache/coyote/http11/Http11Protocol.java 2010-12-06 11:54:20 UTC (rev 1602) +++ trunk/java/org/apache/coyote/http11/Http11Protocol.java 2010-12-06 12:24:17 UTC (rev 1603) @@ -232,6 +232,7 @@ boolean done = false; while (!done && retry < org.apache.coyote.Constants.MAX_PAUSE_WAIT) { retry++; + done = true; for (int i = 0; i < states.length; i++) { if (states[i].getStage() == org.apache.coyote.Constants.STAGE_SERVICE) { try { @@ -239,10 +240,10 @@ } catch (InterruptedException e) { ; } - continue; + done = false; + break; } } - done = true; } if (log.isInfoEnabled()) log.info(sm.getString("http11protocol.pause", getName()));