Author: ron.sigal(a)jboss.com Date: 2008-08-02 00:00:54 -0400 (Sat, 02 Aug 2008) New Revision: 4459 Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ClientSocketWrapper.java Log: JBREM-996, JBREM-997: In createStreams() took timeout reset out of finally clause. Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ClientSocketWrapper.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ClientSocketWrapper.java 2008-08-01 05:55:00 UTC (rev 4458) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ClientSocketWrapper.java 2008-08-02 04:00:54 UTC (rev 4459) @@ -158,16 +158,10 @@ } } - try - { - out = createOutputStream(serializationType, socket, marshaller); - in = createInputStream(serializationType, socket, unmarshaller); - } - finally - { - setTimeout(savedTimeout); - log.debug("reset timeout: " + savedTimeout); - } + out = createOutputStream(serializationType, socket, marshaller); + in = createInputStream(serializationType, socket, unmarshaller); + setTimeout(savedTimeout); + log.debug("reset timeout: " + savedTimeout); } protected InputStream createInputStream(String serializationType, Socket socket, UnMarshaller unmarshaller)