svn commit: r1396294 - in /openejb/trunk/openejb: container/openejb-core/src/test/java/org/apache/openejb/core/mdb/ itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/ tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/

[rmannibucau]

Author: rmannibucau
Date: Tue Oct  9 20:21:31 2012
New Revision: 1396294

URL: http://svn.apache.org/viewvc?rev=1396294&view=rev
Log:
more timeout for tests

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MdbTest.java
    
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/MdbProxy.java
    
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MdbTest.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MdbTest.java?rev=1396294&r1=1396293&r2=1396294&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MdbTest.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MdbTest.java
 Tue Oct  9 20:21:31 2012
@@ -75,7 +75,7 @@ public class MdbTest extends JmsTest {
 
             // wait for the response message
             consumer = session.createConsumer(responseQueue);
-            Message message = consumer.receive(1000);
+            Message message = consumer.receive(5000);
 
             // verify message
             assertNotNull("Did not get a response message", message);

Modified: 
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/MdbProxy.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/MdbProxy.java?rev=1396294&r1=1396293&r2=1396294&view=diff
==============================================================================
--- 
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/MdbProxy.java
 (original)
+++ 
openejb/trunk/openejb/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/MdbProxy.java
 Tue Oct  9 20:21:31 2012
@@ -67,7 +67,7 @@ public class MdbProxy {
     }
 
     private static class MdbInvocationHandler implements InvocationHandler {
-        private static final int MAX_RESPONSE_WAIT = 1000;
+        private static final int MAX_RESPONSE_WAIT = 5000;
         private Connection connection;
         private Session session;
         private MessageProducer producer;

Modified: 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java?rev=1396294&r1=1396293&r2=1396294&view=diff
==============================================================================
--- 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java
 (original)
+++ 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java
 Tue Oct  9 20:21:31 2012
@@ -59,12 +59,14 @@ public class LazyStopWebappClassLoader e
                 || 
"org.apache.openejb.eclipselink.JTATransactionController".equals(name)
                 || 
"org.apache.tomee.mojarra.TomEEInjectionProvider".equals(name)) {
             // don't load them from system classloader (breaks all in embedded 
mode and no sense in other cases)
-            final ClassLoader old = system;
-            system = NoClassClassLoader.INSTANCE;
-            try {
-                return super.loadClass(name);
-            } finally {
-                system = old;
+            synchronized (system) {
+                final ClassLoader old = system;
+                system = NoClassClassLoader.INSTANCE;
+                try {
+                    return super.loadClass(name);
+                } finally {
+                    system = old;
+                }
             }
         }
         return super.loadClass(name);
@@ -126,6 +128,11 @@ public class LazyStopWebappClassLoader e
         return urls;
     }
 
+    @Override
+    public String toString() {
+        return "LazyStop" + super.toString();
+    }
+
     private static class NoClassClassLoader extends ClassLoader {
         private static final NoClassClassLoader INSTANCE = new 
NoClassClassLoader();