Author: manik.surtani(a)jboss.com
Date: 2008-12-17 07:24:12 -0500 (Wed, 17 Dec 2008)
New Revision: 7335
Modified:
core/trunk/src/main/java/org/jboss/cache/loader/TcpDelegatingCacheLoader.java
core/trunk/src/main/java/org/jboss/cache/loader/TcpDelegatingCacheLoaderConfig.java
Log:
JBCACHE-1451 - Read Time Out for TcpDelegatingCacheLoader
Modified: core/trunk/src/main/java/org/jboss/cache/loader/TcpDelegatingCacheLoader.java
===================================================================
---
core/trunk/src/main/java/org/jboss/cache/loader/TcpDelegatingCacheLoader.java 2008-12-16
14:19:02 UTC (rev 7334)
+++
core/trunk/src/main/java/org/jboss/cache/loader/TcpDelegatingCacheLoader.java 2008-12-17
12:24:12 UTC (rev 7335)
@@ -392,6 +392,7 @@
public void start() throws IOException
{
sock = new Socket(config.getHost(), config.getPort());
+ sock.setSoTimeout(config.getReadTimeout());
out = new ObjectOutputStream(new BufferedOutputStream(sock.getOutputStream()));
out.flush();
in = new ObjectInputStream(new BufferedInputStream(sock.getInputStream()));
Modified:
core/trunk/src/main/java/org/jboss/cache/loader/TcpDelegatingCacheLoaderConfig.java
===================================================================
---
core/trunk/src/main/java/org/jboss/cache/loader/TcpDelegatingCacheLoaderConfig.java 2008-12-16
14:19:02 UTC (rev 7334)
+++
core/trunk/src/main/java/org/jboss/cache/loader/TcpDelegatingCacheLoaderConfig.java 2008-12-17
12:24:12 UTC (rev 7335)
@@ -37,6 +37,7 @@
private int port = 7500;
private int timeout = 5000;
private int reconnectWaitTime = 500;
+ private int readTimeout = 0;
public TcpDelegatingCacheLoaderConfig()
{
@@ -113,6 +114,17 @@
this.reconnectWaitTime = reconnectWaitTime;
}
+ public int getReadTimeout()
+ {
+ return readTimeout;
+ }
+
+ public void setReadTimeout(int readTimeout)
+ {
+ testImmutability("readTimeout");
+ this.readTimeout = readTimeout;
+ }
+
@Override
public void setProperties(Properties props)
{
@@ -139,6 +151,12 @@
{
this.reconnectWaitTime = Integer.parseInt(s);
}
+
+ s = props.getProperty("readTimeout");
+ if (s != null && s.length() > 0)
+ {
+ this.readTimeout = Integer.parseInt(s);
+ }
}
@Override
@@ -149,7 +167,9 @@
TcpDelegatingCacheLoaderConfig other = (TcpDelegatingCacheLoaderConfig) obj;
return Util.safeEquals(host, other.host)
- && (port == other.port) && (timeout == other.timeout)
&& (reconnectWaitTime == other.reconnectWaitTime);
+ && (port == other.port) && (timeout == other.timeout)
+ && (reconnectWaitTime == other.reconnectWaitTime)
+ && (readTimeout == other.readTimeout);
}
return false;
}
@@ -162,6 +182,7 @@
result = 31 * result + port;
result = 31 * result + timeout;
result = 31 * result + reconnectWaitTime;
+ result = 31 * result + readTimeout;
return result;
}
Show replies by date