tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andygumbre...@apache.org
Subject svn commit: r1511348 [3/3] - in /tomee/tomee/trunk/server: openejb-client/src/main/java/org/apache/openejb/client/ openejb-client/src/test/java/org/apache/openejb/client/ openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ openejb-ejbd/src/test/...
Date Wed, 07 Aug 2013 15:06:22 GMT
Modified: tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/MultithreadTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/MultithreadTest.java?rev=1511348&r1=1511347&r2=1511348&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/MultithreadTest.java
(original)
+++ tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/MultithreadTest.java
Wed Aug  7 15:06:21 2013
@@ -151,7 +151,7 @@ public class MultithreadTest {
                 } catch (ConcurrentAccessException ex) {
                     comment("Leap Start");
                     timeouts.countDown();
-                    assertEquals("An invocation of the Stateless Session Bean CounterBean
has timed-out", ex.getMessage());
+                    assertEquals("No instances available in Stateless Session Bean pool.
 Waited 100 MILLISECONDS", ex.getMessage());
                 } catch (Throwable t) {
                     error.set(t);
                     fail("Unexpected exception" + t.getClass().getName() + " " + t.getMessage());
// useless in another thread
@@ -293,7 +293,7 @@ public class MultithreadTest {
         public void explode() {
             try {
                 discardedInstances.incrementAndGet();
-                throw new NullPointerException();
+                throw new NullPointerException("Test expected this");
             } finally {
                 invocations.countDown();
             }

Modified: tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/context/RequestInfos.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/context/RequestInfos.java?rev=1511348&r1=1511347&r2=1511348&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/context/RequestInfos.java
(original)
+++ tomee/tomee/trunk/server/openejb-server/src/main/java/org/apache/openejb/server/context/RequestInfos.java
Wed Aug  7 15:06:21 2013
@@ -26,6 +26,7 @@ import java.net.Socket;
 import java.net.SocketAddress;
 
 public final class RequestInfos {
+
     private static final ThreadLocal<RequestInfo> REQUEST_INFO = new ThreadLocal<RequestInfo>();
 
     private RequestInfos() {
@@ -70,6 +71,7 @@ public final class RequestInfos {
     }
 
     public static class RequestInfo {
+
         public String ip;
         public CountingInputStream inputStream;
         public CountingOutputStream outputStream;
@@ -77,10 +79,10 @@ public final class RequestInfos {
         @Override
         public String toString() {
             return "RequestInfo{"
-                    + "ip='" + ip + '\''
-                    + ", request-size=" + inputStream.getCount()
-                    + ", response-size=" + outputStream.getCount()
-                    + '}';
+                   + "ip='" + ip + '\''
+                   + ", request-size=" + (inputStream != null ? inputStream.getCount() :
"unknown")
+                   + ", response-size=" + (outputStream != null ? outputStream.getCount()
: "unknown")
+                   + '}';
         }
     }
 }



Mime
View raw message