JBoss Remoting SVN: r5451 - remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-09-10 11:59:04 -0400 (Thu, 10 Sep 2009)
New Revision: 5451
Modified:
remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java
Log:
JBREM-1152: After calling getConnection(), catches SocketException and generalized IOExceptions and retries.
Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java
===================================================================
--- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java 2009-09-10 15:57:08 UTC (rev 5450)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java 2009-09-10 15:59:04 UTC (rev 5451)
@@ -600,6 +600,25 @@
{
socketWrapper = getConnection(marshaller, unmarshaller, timeLeft);
}
+ catch (SocketException e)
+ {
+ log.debug(this + " got " + e + ": " + e.getMessage());
+ semaphore.release();
+ continue;
+ }
+ catch (IOException e)
+ {
+ semaphore.release();
+ if (trace) log.trace(this + " released semaphore: " + semaphore.permits());
+ if (isGeneralizeSocketException() && RETRIABLE_ERROR_MESSAGE.matcher(e.getMessage()).matches())
+ {
+ log.debug(this + " got " + e + ": " + e.getMessage());
+ continue;
+ }
+ throw new CannotConnectException(
+ "Can not get connection to server. Problem establishing " +
+ "socket connection for " + locator, e);
+ }
catch (Exception e)
{
// if (bailOut)
15 years, 3 months
JBoss Remoting SVN: r5450 - remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-09-10 11:57:08 -0400 (Thu, 10 Sep 2009)
New Revision: 5450
Modified:
remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java
Log:
JBREM-1152: createSocket() rethrows exception it gets after writing, and throws SocketException instead of IOException in two cases.
Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java
===================================================================
--- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java 2009-09-08 20:48:16 UTC (rev 5449)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java 2009-09-10 15:57:08 UTC (rev 5450)
@@ -26,6 +26,7 @@
import java.io.OutputStream;
import java.lang.reflect.Method;
import java.net.Socket;
+import java.net.SocketException;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -506,6 +507,7 @@
catch (IOException e)
{
log.debug(this + " unable to write Bisocket.CREATE_ORDINARY_SOCKET", e);
+ throw e;
}
}
@@ -566,10 +568,10 @@
if (pingFailed.flag)
{
- throw new IOException("Unable to create socket");
+ throw new SocketException("Unable to create socket");
}
- throw new IOException("Timed out trying to create socket");
+ throw new SocketException("Timed out trying to create socket");
}
15 years, 3 months
JBoss Remoting SVN: r5449 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/config.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-09-08 16:48:16 -0400 (Tue, 08 Sep 2009)
New Revision: 5449
Modified:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/config/ConfigurationMapTestParent.java
Log:
JBREM-1102: Changed wrote from a boolean to an int.
Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/config/ConfigurationMapTestParent.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/config/ConfigurationMapTestParent.java 2009-09-04 16:15:32 UTC (rev 5448)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/config/ConfigurationMapTestParent.java 2009-09-08 20:48:16 UTC (rev 5449)
@@ -69,7 +69,7 @@
if (firstTime)
{
firstTime = false;
- Logger.getLogger("org.jboss.remoting").setLevel(XLevel.INFO);
+ Logger.getLogger("org.jboss.remoting").setLevel(XLevel.TRACE);
Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO);
String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n";
PatternLayout layout = new PatternLayout(pattern);
@@ -368,6 +368,7 @@
host = InetAddress.getLocalHost().getHostAddress();
port = PortUtil.findFreePort(host);
locatorURI = getTransport() + "://" + host + ":" + port + "/?" + parameter;
+// locatorURI += "&serializationtype=jboss";
String metadata = System.getProperty("remoting.metadata");
if (metadata != null)
{
15 years, 3 months
JBoss Remoting SVN: r5448 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/timeout/idle.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-09-04 12:15:32 -0400 (Fri, 04 Sep 2009)
New Revision: 5448
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/timeout/idle/SafeIdleTimeoutTestCase.java
Log:
JBREM-1107: Reduced log level to INFO.
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/timeout/idle/SafeIdleTimeoutTestCase.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/timeout/idle/SafeIdleTimeoutTestCase.java 2009-09-04 16:15:00 UTC (rev 5447)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/timeout/idle/SafeIdleTimeoutTestCase.java 2009-09-04 16:15:32 UTC (rev 5448)
@@ -74,7 +74,7 @@
if (firstTime)
{
firstTime = false;
- Logger.getLogger("org.jboss.remoting").setLevel(XLevel.TRACE);
+ Logger.getLogger("org.jboss.remoting").setLevel(XLevel.INFO);
Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO);
String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n";
PatternLayout layout = new PatternLayout(pattern);
15 years, 3 months
JBoss Remoting SVN: r5447 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/timeout/idle.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-09-04 12:15:00 -0400 (Fri, 04 Sep 2009)
New Revision: 5447
Modified:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/timeout/idle/SafeIdleTimeoutTestCase.java
Log:
JBREM-1107: Reduced log level to INFO.
Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/timeout/idle/SafeIdleTimeoutTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/timeout/idle/SafeIdleTimeoutTestCase.java 2009-09-04 16:11:07 UTC (rev 5446)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/timeout/idle/SafeIdleTimeoutTestCase.java 2009-09-04 16:15:00 UTC (rev 5447)
@@ -34,7 +34,6 @@
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.log4j.PatternLayout;
-import org.jboss.logging.XLevel;
import org.jboss.remoting.Client;
import org.jboss.remoting.InvocationRequest;
import org.jboss.remoting.InvokerLocator;
@@ -74,7 +73,7 @@
if (firstTime)
{
firstTime = false;
- Logger.getLogger("org.jboss.remoting").setLevel(XLevel.TRACE);
+ Logger.getLogger("org.jboss.remoting").setLevel(Level.INFO);
Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO);
String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n";
PatternLayout layout = new PatternLayout(pattern);
15 years, 3 months
JBoss Remoting SVN: r5446 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/socketexception.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-09-04 12:11:07 -0400 (Fri, 04 Sep 2009)
New Revision: 5446
Modified:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/socketexception/GeneralizeSocketExceptionTestCase.java
Log:
JBREM-1146: Reduced log level to INFO.
Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/socketexception/GeneralizeSocketExceptionTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/socketexception/GeneralizeSocketExceptionTestCase.java 2009-09-04 16:10:25 UTC (rev 5445)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/socketexception/GeneralizeSocketExceptionTestCase.java 2009-09-04 16:11:07 UTC (rev 5446)
@@ -83,7 +83,7 @@
if (firstTime)
{
firstTime = false;
- Logger.getLogger("org.jboss.remoting").setLevel(Level.DEBUG);
+ Logger.getLogger("org.jboss.remoting").setLevel(Level.INFO);
Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO);
String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n";
PatternLayout layout = new PatternLayout(pattern);
15 years, 3 months
JBoss Remoting SVN: r5445 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/socketexception.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-09-04 12:10:25 -0400 (Fri, 04 Sep 2009)
New Revision: 5445
Modified:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/socketexception/GeneralizeSocketExceptionTestCase.java
Log:
JBREM-1146: Reduced log level to INFO.
Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/socketexception/GeneralizeSocketExceptionTestCase.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/socketexception/GeneralizeSocketExceptionTestCase.java 2009-09-03 22:53:55 UTC (rev 5444)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/socketexception/GeneralizeSocketExceptionTestCase.java 2009-09-04 16:10:25 UTC (rev 5445)
@@ -84,7 +84,7 @@
if (firstTime)
{
firstTime = false;
- Logger.getLogger("org.jboss.remoting").setLevel(XLevel.DEBUG);
+ Logger.getLogger("org.jboss.remoting").setLevel(XLevel.INFO);
Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO);
String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n";
PatternLayout layout = new PatternLayout(pattern);
15 years, 3 months
JBoss Remoting SVN: r5444 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/config.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-09-03 18:53:55 -0400 (Thu, 03 Sep 2009)
New Revision: 5444
Modified:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/config/ConfigTestMarshaller.java
Log:
JBREM-1102: Added some logging.
Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/config/ConfigTestMarshaller.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/config/ConfigTestMarshaller.java 2009-09-03 22:38:56 UTC (rev 5443)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/marshall/config/ConfigTestMarshaller.java 2009-09-03 22:53:55 UTC (rev 5444)
@@ -52,7 +52,7 @@
public Marshaller cloneMarshaller() throws CloneNotSupportedException
{
cloned++;
- log.info("cloned ConfigTestMarshaller");
+ log.info("cloned ConfigTestMarshaller: wrote: " + wrote + ", cloned: " + cloned );
// log.info("cloned ConfigTestMarshaller", new Exception());
return new ConfigTestMarshaller();
}
15 years, 3 months
JBoss Remoting SVN: r5443 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-09-03 18:38:56 -0400 (Thu, 03 Sep 2009)
New Revision: 5443
Modified:
remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java
Log:
JBREM-1112: Extended Thread.sleep() in testZeroMetadata().
Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java 2009-09-03 01:50:09 UTC (rev 5442)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java 2009-09-03 22:38:56 UTC (rev 5443)
@@ -411,7 +411,7 @@
client.addConnectionListener(clientConnectionListener, metadata);
// Wait for broken connection and test.
- Thread.sleep(8000);
+ Thread.sleep(10000);
assertTrue(serverConnectionListener.notified);
assertNull(serverConnectionListener.throwable);
assertTrue(clientConnectionListener.notified);
15 years, 3 months
JBoss Remoting SVN: r5442 - remoting2/branches/2.x/src/main/org/jboss/remoting.
by jboss-remoting-commits@lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2009-09-02 21:50:09 -0400 (Wed, 02 Sep 2009)
New Revision: 5442
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/Lease.java
Log:
JBREM-1150: Changed test in updateLease() from > to >=.
Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/Lease.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/Lease.java 2009-09-03 01:48:37 UTC (rev 5441)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/Lease.java 2009-09-03 01:50:09 UTC (rev 5442)
@@ -109,7 +109,7 @@
String timeString = (String) requestMap.get(LeasePinger.TIME_STAMP);
time = Long.valueOf(timeString).longValue();
if (isTraceEnabled) log.trace(this + " last update: " + lastUpdate + ", this update: " + time);
- if (time > lastUpdate)
+ if (time >= lastUpdate)
{
lastUpdate = time;
doUpdate(requestMap);
15 years, 3 months