Author: remy.maucherat(a)jboss.com Date: 2009-04-07 23:28:20 -0400 (Tue, 07 Apr 2009) New Revision: 993 Modified: trunk/java/org/apache/coyote/http11/Http11Processor.java trunk/java/org/jboss/web/cluster/advertise/AdvertiseListener.java Log: - Minor fixes. Modified: trunk/java/org/apache/coyote/http11/Http11Processor.java =================================================================== --- trunk/java/org/apache/coyote/http11/Http11Processor.java 2009-04-07 23:09:34 UTC (rev 992) +++ trunk/java/org/apache/coyote/http11/Http11Processor.java 2009-04-08 03:28:20 UTC (rev 993) @@ -810,7 +810,6 @@ int keepAliveLeft = maxKeepAliveRequests; int soTimeout = socket.getSoTimeout(); - int oldSoTimeout = soTimeout; int threadRatio = (endpoint.getCurrentThreadsBusy() * 100) / endpoint.getMaxThreads(); @@ -818,15 +817,6 @@ keepAliveLeft = 1; } - if (soTimeout != oldSoTimeout) { - try { - socket.setSoTimeout(soTimeout); - } catch (Throwable t) { - log.debug(sm.getString("http11processor.socket.timeout"), t); - error = true; - } - } - boolean keptAlive = false; while (!error && keepAlive && !event) { Modified: trunk/java/org/jboss/web/cluster/advertise/AdvertiseListener.java =================================================================== --- trunk/java/org/jboss/web/cluster/advertise/AdvertiseListener.java 2009-04-07 23:09:34 UTC (rev 992) +++ trunk/java/org/jboss/web/cluster/advertise/AdvertiseListener.java 2009-04-08 03:28:20 UTC (rev 993) @@ -175,9 +175,9 @@ /** Remove the AdvertisedServer from the collection. * @param server Server to remove. */ - public void removeServer(AdvertisedServer server) + public void removeServer(String name) { - servers.remove(server); + servers.remove(name); } private void init()