[jboss-cvs] JBossRemoting/src/main/org/jboss/remoting/transport/http ...
Ron Sigal
ron_sigal at yahoo.com
Tue Jun 19 14:38:17 EDT 2007
User: rsigal
Date: 07/06/19 14:38:17
Modified: src/main/org/jboss/remoting/transport/http Tag:
remoting_2_x HTTPClientInvoker.java
Log:
JBREM-754: Doesn't create thread pool if timeout == 0.
Revision Changes Path
No revision
No revision
1.31.2.6 +3 -7 JBossRemoting/src/main/org/jboss/remoting/transport/http/HTTPClientInvoker.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: HTTPClientInvoker.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/http/HTTPClientInvoker.java,v
retrieving revision 1.31.2.5
retrieving revision 1.31.2.6
diff -u -b -r1.31.2.5 -r1.31.2.6
--- HTTPClientInvoker.java 16 Jun 2007 08:16:29 -0000 1.31.2.5
+++ HTTPClientInvoker.java 19 Jun 2007 18:38:17 -0000 1.31.2.6
@@ -130,7 +130,7 @@
int simulatedTimeout = getSimulatedTimeout(configuration, metadata, conn);
- if (simulatedTimeout < 0)
+ if (simulatedTimeout <= 0)
{
return useHttpURLConnection(conn, invocation, metadata, marshaller, unmarshaller);
}
@@ -520,7 +520,6 @@
private int getSimulatedTimeout(Map configuration, Map metadata, HttpURLConnection conn)
{
- int simulatedTimeout = -1;
int timeout = -1;
String connectionTimeout = (String) configuration.get("timeout");
String invocationTimeout = (String) metadata.get("timeout");
@@ -567,23 +566,20 @@
}
catch (NoSuchMethodException e)
{
- simulatedTimeout = timeout;
log.debug("Using older JDK (prior to 1.5): will simulate timeout");
}
catch (IllegalAccessException e)
{
- simulatedTimeout = timeout;
log.error("Error setting http client connection timeout.");
log.debug(e);
}
catch (InvocationTargetException e)
{
- simulatedTimeout = timeout;
log.error("Error setting http client connection timeout.");
log.debug(e);
}
- return simulatedTimeout;
+ return timeout;
}
protected String validateURL(String url)
More information about the jboss-cvs-commits
mailing list