[pkg-java] r8497 - trunk/libjboss-remoting-java/debian/patches
Torsten Werner
twerner at alioth.debian.org
Mon Jun 15 19:59:33 UTC 2009
Author: twerner
Date: 2009-06-15 19:59:32 +0000 (Mon, 15 Jun 2009)
New Revision: 8497
Modified:
trunk/libjboss-remoting-java/debian/patches/concurrent.diff
Log:
improve patch concurrent.diff
Modified: trunk/libjboss-remoting-java/debian/patches/concurrent.diff
===================================================================
--- trunk/libjboss-remoting-java/debian/patches/concurrent.diff 2009-06-15 19:28:11 UTC (rev 8496)
+++ trunk/libjboss-remoting-java/debian/patches/concurrent.diff 2009-06-15 19:59:32 UTC (rev 8497)
@@ -1,7 +1,7 @@
Index: libjboss-remoting-java-2.5.1/src/org/jboss/remoting/LeasePinger.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/src/org/jboss/remoting/LeasePinger.java 2009-06-15 21:22:05.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/src/org/jboss/remoting/LeasePinger.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/src/org/jboss/remoting/LeasePinger.java 2009-06-15 21:03:16.000000000 +0200
++++ libjboss-remoting-java-2.5.1/src/org/jboss/remoting/LeasePinger.java 2009-06-15 21:25:08.000000000 +0200
@@ -9,7 +9,7 @@
import java.util.Timer;
import java.util.TimerTask;
@@ -13,8 +13,8 @@
* Internal agent class to ping the remote server to keep lease alive.
Index: libjboss-remoting-java-2.5.1/src/org/jboss/remoting/ServerInvoker.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/src/org/jboss/remoting/ServerInvoker.java 2009-06-15 21:22:05.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/src/org/jboss/remoting/ServerInvoker.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/src/org/jboss/remoting/ServerInvoker.java 2009-06-15 21:03:16.000000000 +0200
++++ libjboss-remoting-java-2.5.1/src/org/jboss/remoting/ServerInvoker.java 2009-06-15 21:25:08.000000000 +0200
@@ -44,7 +44,7 @@
import org.jboss.util.threadpool.ThreadPoolMBean;
import org.jboss.logging.Logger;
@@ -26,8 +26,8 @@
import javax.management.MBeanServerInvocationHandler;
Index: libjboss-remoting-java-2.5.1/src/org/jboss/remoting/marshal/encryption/EncryptionManager.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/src/org/jboss/remoting/marshal/encryption/EncryptionManager.java 2009-06-15 21:22:05.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/src/org/jboss/remoting/marshal/encryption/EncryptionManager.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/src/org/jboss/remoting/marshal/encryption/EncryptionManager.java 2009-06-15 21:03:16.000000000 +0200
++++ libjboss-remoting-java-2.5.1/src/org/jboss/remoting/marshal/encryption/EncryptionManager.java 2009-06-15 21:25:08.000000000 +0200
@@ -21,7 +21,7 @@
*/
package org.jboss.remoting.marshal.encryption;
@@ -39,8 +39,8 @@
import javax.crypto.Cipher;
Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/classloader/InvokerClientTest.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/classloader/InvokerClientTest.java 2009-06-15 21:22:05.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/classloader/InvokerClientTest.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/classloader/InvokerClientTest.java 2009-06-15 21:03:16.000000000 +0200
++++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/classloader/InvokerClientTest.java 2009-06-15 21:25:08.000000000 +0200
@@ -58,7 +58,7 @@
"javax.servlet.ServletInputStream",
"org.apache.coyote.Adapter",
@@ -52,8 +52,8 @@
URLClassLoader urlclassloader = new URLClassLoader(urls, null);
Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/rmi/MultiThreadedRMIPerformanceClient.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/raw/rmi/MultiThreadedRMIPerformanceClient.java 2009-06-15 21:22:06.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/rmi/MultiThreadedRMIPerformanceClient.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/raw/rmi/MultiThreadedRMIPerformanceClient.java 2009-06-15 21:03:17.000000000 +0200
++++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/rmi/MultiThreadedRMIPerformanceClient.java 2009-06-15 21:25:08.000000000 +0200
@@ -22,7 +22,7 @@
package org.jboss.test.remoting.performance.raw.rmi;
@@ -72,8 +72,8 @@
+}
Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/rmi/RMICallbackServer.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/raw/rmi/RMICallbackServer.java 2009-06-15 21:22:06.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/rmi/RMICallbackServer.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/raw/rmi/RMICallbackServer.java 2009-06-15 21:03:17.000000000 +0200
++++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/rmi/RMICallbackServer.java 2009-06-15 21:25:08.000000000 +0200
@@ -30,7 +30,7 @@
import org.jboss.remoting.callback.HandleCallbackException;
import org.jboss.test.remoting.performance.synchronous.PerformanceCallbackKeeper;
@@ -92,8 +92,8 @@
+}
Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/rmi/RMIPerformanceClient.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/raw/rmi/RMIPerformanceClient.java 2009-06-15 21:22:06.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/rmi/RMIPerformanceClient.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/raw/rmi/RMIPerformanceClient.java 2009-06-15 21:03:17.000000000 +0200
++++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/rmi/RMIPerformanceClient.java 2009-06-15 21:25:08.000000000 +0200
@@ -22,7 +22,7 @@
package org.jboss.test.remoting.performance.raw.rmi;
@@ -112,8 +112,8 @@
+}
Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/rmi/RMIServer.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/raw/rmi/RMIServer.java 2009-06-15 21:22:06.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/rmi/RMIServer.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/raw/rmi/RMIServer.java 2009-06-15 21:03:17.000000000 +0200
++++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/rmi/RMIServer.java 2009-06-15 21:25:08.000000000 +0200
@@ -22,7 +22,7 @@
package org.jboss.test.remoting.performance.raw.rmi;
@@ -132,8 +132,8 @@
+}
Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/socket/MultiThreadedSocketPerformanceClient.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/raw/socket/MultiThreadedSocketPerformanceClient.java 2009-06-15 21:22:06.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/socket/MultiThreadedSocketPerformanceClient.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/raw/socket/MultiThreadedSocketPerformanceClient.java 2009-06-15 21:03:17.000000000 +0200
++++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/socket/MultiThreadedSocketPerformanceClient.java 2009-06-15 21:25:08.000000000 +0200
@@ -22,7 +22,7 @@
package org.jboss.test.remoting.performance.raw.socket;
@@ -152,8 +152,8 @@
+}
Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/socket/SocketCallbackServer.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/raw/socket/SocketCallbackServer.java 2009-06-15 21:22:06.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/socket/SocketCallbackServer.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/raw/socket/SocketCallbackServer.java 2009-06-15 21:03:17.000000000 +0200
++++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/socket/SocketCallbackServer.java 2009-06-15 21:25:08.000000000 +0200
@@ -22,7 +22,7 @@
package org.jboss.test.remoting.performance.raw.socket;
@@ -172,8 +172,8 @@
+}
Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/socket/SocketPerformanceClient.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/raw/socket/SocketPerformanceClient.java 2009-06-15 21:22:06.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/socket/SocketPerformanceClient.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/raw/socket/SocketPerformanceClient.java 2009-06-15 21:03:17.000000000 +0200
++++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/socket/SocketPerformanceClient.java 2009-06-15 21:25:08.000000000 +0200
@@ -22,7 +22,7 @@
package org.jboss.test.remoting.performance.raw.socket;
@@ -192,8 +192,8 @@
+}
Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/socket/SocketServer.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/raw/socket/SocketServer.java 2009-06-15 21:22:06.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/socket/SocketServer.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/raw/socket/SocketServer.java 2009-06-15 21:03:17.000000000 +0200
++++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/raw/socket/SocketServer.java 2009-06-15 21:25:08.000000000 +0200
@@ -22,7 +22,7 @@
package org.jboss.test.remoting.performance.raw.socket;
@@ -212,8 +212,8 @@
+}
Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServer.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServer.java 2009-06-15 21:22:06.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServer.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServer.java 2009-06-15 21:03:17.000000000 +0200
++++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServer.java 2009-06-15 21:25:08.000000000 +0200
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.hessian.client;
@@ -225,8 +225,8 @@
Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServerImpl.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServerImpl.java 2009-06-15 21:22:06.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServerImpl.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServerImpl.java 2009-06-15 21:03:17.000000000 +0200
++++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianCallbackServerImpl.java 2009-06-15 21:25:08.000000000 +0200
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.hessian.client;
@@ -238,8 +238,8 @@
Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianPerformanceClient.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianPerformanceClient.java 2009-06-15 21:22:06.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianPerformanceClient.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianPerformanceClient.java 2009-06-15 21:03:17.000000000 +0200
++++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/hessian/client/SpringHessianPerformanceClient.java 2009-06-15 21:25:08.000000000 +0200
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.hessian.client;
@@ -251,8 +251,8 @@
import org.jboss.logging.Logger;
Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/hessian/web/SpringHessianServerImpl.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/hessian/web/SpringHessianServerImpl.java 2009-06-15 21:22:06.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/hessian/web/SpringHessianServerImpl.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/hessian/web/SpringHessianServerImpl.java 2009-06-15 21:03:17.000000000 +0200
++++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/hessian/web/SpringHessianServerImpl.java 2009-06-15 21:25:08.000000000 +0200
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.hessian.web;
@@ -264,8 +264,8 @@
Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServer.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServer.java 2009-06-15 21:22:06.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServer.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServer.java 2009-06-15 21:03:17.000000000 +0200
++++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServer.java 2009-06-15 21:25:08.000000000 +0200
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.http.client;
@@ -277,8 +277,8 @@
Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServerImpl.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServerImpl.java 2009-06-15 21:22:05.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServerImpl.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServerImpl.java 2009-06-15 21:03:17.000000000 +0200
++++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpCallbackServerImpl.java 2009-06-15 21:25:08.000000000 +0200
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.http.client;
@@ -290,8 +290,8 @@
Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpPerformanceClient.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpPerformanceClient.java 2009-06-15 21:22:06.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpPerformanceClient.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpPerformanceClient.java 2009-06-15 21:03:17.000000000 +0200
++++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/http/client/SpringHttpPerformanceClient.java 2009-06-15 21:25:08.000000000 +0200
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.http.client;
@@ -303,8 +303,8 @@
import org.jboss.logging.Logger;
Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/http/web/SpringHttpServerImpl.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/http/web/SpringHttpServerImpl.java 2009-06-15 21:22:06.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/http/web/SpringHttpServerImpl.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/http/web/SpringHttpServerImpl.java 2009-06-15 21:03:17.000000000 +0200
++++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/http/web/SpringHttpServerImpl.java 2009-06-15 21:25:08.000000000 +0200
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.http.web;
@@ -316,8 +316,8 @@
Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/rmi/MultiThreadedSpringRMIPerformanceClient.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/rmi/MultiThreadedSpringRMIPerformanceClient.java 2009-06-15 21:22:06.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/rmi/MultiThreadedSpringRMIPerformanceClient.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/rmi/MultiThreadedSpringRMIPerformanceClient.java 2009-06-15 21:03:17.000000000 +0200
++++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/rmi/MultiThreadedSpringRMIPerformanceClient.java 2009-06-15 21:25:08.000000000 +0200
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.rmi;
@@ -336,8 +336,8 @@
+}
Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServer.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServer.java 2009-06-15 21:22:06.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServer.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServer.java 2009-06-15 21:03:17.000000000 +0200
++++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServer.java 2009-06-15 21:25:08.000000000 +0200
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.rmi;
@@ -356,8 +356,8 @@
+}
Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServerImpl.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServerImpl.java 2009-06-15 21:22:06.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServerImpl.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServerImpl.java 2009-06-15 21:03:17.000000000 +0200
++++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMICallbackServerImpl.java 2009-06-15 21:25:08.000000000 +0200
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.rmi;
@@ -376,8 +376,8 @@
+}
Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIPerformanceClient.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIPerformanceClient.java 2009-06-15 21:22:06.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIPerformanceClient.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIPerformanceClient.java 2009-06-15 21:03:17.000000000 +0200
++++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIPerformanceClient.java 2009-06-15 21:25:08.000000000 +0200
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.rmi;
@@ -396,8 +396,8 @@
+}
Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIServerImpl.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIServerImpl.java 2009-06-15 21:22:06.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIServerImpl.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIServerImpl.java 2009-06-15 21:03:17.000000000 +0200
++++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/spring/rmi/SpringRMIServerImpl.java 2009-06-15 21:25:08.000000000 +0200
@@ -8,7 +8,7 @@
***************************************/
package org.jboss.test.remoting.performance.spring.rmi;
@@ -416,8 +416,8 @@
+}
Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/synchronous/CallTracker.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/synchronous/CallTracker.java 2009-06-15 21:22:06.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/synchronous/CallTracker.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/synchronous/CallTracker.java 2009-06-15 21:03:17.000000000 +0200
++++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/synchronous/CallTracker.java 2009-06-15 21:25:08.000000000 +0200
@@ -26,7 +26,7 @@
import org.jboss.remoting.callback.HandleCallbackException;
import org.jboss.remoting.callback.InvokerCallbackHandler;
@@ -436,8 +436,8 @@
+}
Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/synchronous/MultiThreadedPerformanceClientTest.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/synchronous/MultiThreadedPerformanceClientTest.java 2009-06-15 21:22:06.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/synchronous/MultiThreadedPerformanceClientTest.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/synchronous/MultiThreadedPerformanceClientTest.java 2009-06-15 21:03:17.000000000 +0200
++++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/synchronous/MultiThreadedPerformanceClientTest.java 2009-06-15 21:25:08.000000000 +0200
@@ -22,8 +22,8 @@
package org.jboss.test.remoting.performance.synchronous;
@@ -451,8 +451,8 @@
import org.jboss.jrunit.controller.ThreadLocalBenchmark;
Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/synchronous/PerformanceCallbackHandler.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/synchronous/PerformanceCallbackHandler.java 2009-06-15 21:22:06.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/synchronous/PerformanceCallbackHandler.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/synchronous/PerformanceCallbackHandler.java 2009-06-15 21:03:17.000000000 +0200
++++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/synchronous/PerformanceCallbackHandler.java 2009-06-15 21:25:08.000000000 +0200
@@ -26,7 +26,7 @@
import org.jboss.remoting.callback.HandleCallbackException;
import org.jboss.remoting.callback.InvokerCallbackHandler;
@@ -464,8 +464,8 @@
* @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/synchronous/PerformanceClientTest.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/synchronous/PerformanceClientTest.java 2009-06-15 21:22:06.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/synchronous/PerformanceClientTest.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/synchronous/PerformanceClientTest.java 2009-06-15 21:03:17.000000000 +0200
++++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/synchronous/PerformanceClientTest.java 2009-06-15 21:25:08.000000000 +0200
@@ -22,7 +22,7 @@
package org.jboss.test.remoting.performance.synchronous;
@@ -477,8 +477,8 @@
import org.jboss.jrunit.controller.ThreadLocalBenchmark;
Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/synchronous/PerformanceInvocationHandler.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/synchronous/PerformanceInvocationHandler.java 2009-06-15 21:22:06.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/synchronous/PerformanceInvocationHandler.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/performance/synchronous/PerformanceInvocationHandler.java 2009-06-15 21:03:17.000000000 +0200
++++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/performance/synchronous/PerformanceInvocationHandler.java 2009-06-15 21:25:08.000000000 +0200
@@ -34,9 +34,9 @@
import org.jboss.remoting.callback.ServerInvokerCallbackHandler;
import org.jboss.remoting.invocation.RemoteInvocation;
@@ -501,8 +501,8 @@
+}
Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/transport/socket/load/PooledConnectionTestCase.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/transport/socket/load/PooledConnectionTestCase.java 2009-06-15 21:22:06.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/transport/socket/load/PooledConnectionTestCase.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/transport/socket/load/PooledConnectionTestCase.java 2009-06-15 21:03:17.000000000 +0200
++++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/transport/socket/load/PooledConnectionTestCase.java 2009-06-15 21:25:08.000000000 +0200
@@ -1,6 +1,6 @@
package org.jboss.test.remoting.transport.socket.load;
@@ -513,8 +513,8 @@
import org.jboss.remoting.Client;
Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/transport/socket/timeout/idle/IdleTimeoutClientTest.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/transport/socket/timeout/idle/IdleTimeoutClientTest.java 2009-06-15 21:22:06.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/transport/socket/timeout/idle/IdleTimeoutClientTest.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/transport/socket/timeout/idle/IdleTimeoutClientTest.java 2009-06-15 21:03:17.000000000 +0200
++++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/transport/socket/timeout/idle/IdleTimeoutClientTest.java 2009-06-15 21:25:08.000000000 +0200
@@ -1,6 +1,6 @@
package org.jboss.test.remoting.transport.socket.timeout.idle;
@@ -525,8 +525,8 @@
import org.jboss.remoting.Client;
Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/transport/socket/timeout/idle/InactiveIdleTimeoutClientTest.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/transport/socket/timeout/idle/InactiveIdleTimeoutClientTest.java 2009-06-15 21:22:06.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/transport/socket/timeout/idle/InactiveIdleTimeoutClientTest.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/transport/socket/timeout/idle/InactiveIdleTimeoutClientTest.java 2009-06-15 21:03:17.000000000 +0200
++++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/transport/socket/timeout/idle/InactiveIdleTimeoutClientTest.java 2009-06-15 21:25:08.000000000 +0200
@@ -1,6 +1,6 @@
package org.jboss.test.remoting.transport.socket.timeout.idle;
@@ -537,8 +537,8 @@
import org.jboss.remoting.Client;
Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/util/PortUtilTestCase.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/util/PortUtilTestCase.java 2009-06-15 21:22:05.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/util/PortUtilTestCase.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/util/PortUtilTestCase.java 2009-06-15 21:03:17.000000000 +0200
++++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/util/PortUtilTestCase.java 2009-06-15 21:25:08.000000000 +0200
@@ -24,7 +24,7 @@
import org.jboss.remoting.transport.PortUtil;
@@ -557,8 +557,8 @@
+}
Index: libjboss-remoting-java-2.5.1/src/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/src/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java 2009-06-15 21:22:05.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/src/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/src/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java 2009-06-15 21:03:16.000000000 +0200
++++ libjboss-remoting-java-2.5.1/src/org/jboss/remoting/transport/bisocket/BisocketClientInvoker.java 2009-06-15 21:25:08.000000000 +0200
@@ -52,7 +52,7 @@
import org.jboss.remoting.transport.socket.SocketWrapper;
import org.jboss.remoting.util.SecurityUtility;
@@ -577,18 +577,19 @@
+}
Index: libjboss-remoting-java-2.5.1/src/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/src/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java 2009-06-15 21:22:05.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/src/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java 2009-06-15 21:24:01.000000000 +0200
-@@ -40,7 +40,7 @@
+--- libjboss-remoting-java-2.5.1.orig/src/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java 2009-06-15 21:03:16.000000000 +0200
++++ libjboss-remoting-java-2.5.1/src/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java 2009-06-15 21:47:56.000000000 +0200
+@@ -40,7 +40,8 @@
import java.util.List;
import java.util.Map;
import java.util.Properties;
-import EDU.oswego.cs.dl.util.concurrent.Semaphore;
+import java.util.concurrent.Semaphore;
++import java.util.concurrent.TimeUnit;
/**
* SocketClientInvoker uses Sockets to remotely connect to the a remote ServerInvoker, which must be
-@@ -474,7 +474,7 @@
+@@ -474,7 +475,7 @@
if (semaphore == null)
return 0;
@@ -597,7 +598,7 @@
}
public int getNumberOfAvailableConnections()
-@@ -482,7 +482,7 @@
+@@ -482,7 +483,7 @@
if (semaphore == null)
return 0;
@@ -606,7 +607,7 @@
}
// Package protected ----------------------------------------------------------------------------
-@@ -764,7 +764,7 @@
+@@ -764,7 +765,7 @@
catch (InterruptedException e)
{
semaphore.release();
@@ -615,7 +616,7 @@
throw new RuntimeException(e);
}
catch (Exception e)
-@@ -772,7 +772,7 @@
+@@ -772,7 +773,7 @@
// if (bailOut)
// return null;
semaphore.release();
@@ -624,7 +625,7 @@
sockEx = new CannotConnectException(
"Can not get connection to server. Problem establishing " +
"socket connection for " + locator, e);
-@@ -878,7 +878,7 @@
+@@ -878,7 +879,7 @@
try
{
semaphore.release();
@@ -633,7 +634,7 @@
socketWrapper.close();
}
catch (Exception ignored)
-@@ -932,7 +932,7 @@
+@@ -932,7 +933,7 @@
}
}
semaphore.release();
@@ -642,7 +643,7 @@
}
if (trace && !oneway) { log.trace(this + " received response " + response); }
-@@ -971,7 +971,7 @@
+@@ -971,7 +972,7 @@
try
{
semaphore.release();
@@ -651,19 +652,21 @@
socketWrapper.close();
}
catch (Exception ex)
-@@ -1046,7 +1046,7 @@
+@@ -1045,8 +1046,8 @@
+ {
long start = System.currentTimeMillis();
long timeToWait = (timeAllowed > 0) ? timeAllowed : connectionWait;
- boolean timedout = !semaphore.attempt(timeToWait);
+- boolean timedout = !semaphore.attempt(timeToWait);
- if (trace) log.trace(this + " obtained semaphore: " + semaphore.permits());
++ boolean timedout = !semaphore.tryAcquire(timeToWait, TimeUnit.MILLISECONDS);
+ if (trace) log.trace(this + " obtained semaphore: " + semaphore.availablePermits());
if (timedout)
{
Index: libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/transport/socket/interrupt/MockInvokerInterruptTestCase.java
===================================================================
---- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/transport/socket/interrupt/MockInvokerInterruptTestCase.java 2009-06-15 21:22:06.000000000 +0200
-+++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/transport/socket/interrupt/MockInvokerInterruptTestCase.java 2009-06-15 21:22:14.000000000 +0200
+--- libjboss-remoting-java-2.5.1.orig/tests/org/jboss/test/remoting/transport/socket/interrupt/MockInvokerInterruptTestCase.java 2009-06-15 21:03:17.000000000 +0200
++++ libjboss-remoting-java-2.5.1/tests/org/jboss/test/remoting/transport/socket/interrupt/MockInvokerInterruptTestCase.java 2009-06-15 21:25:08.000000000 +0200
@@ -32,7 +32,7 @@
import org.jboss.remoting.transport.socket.MicroSocketClientInvoker;
import org.jboss.remoting.transport.socket.SocketWrapper;
More information about the pkg-java-commits
mailing list