cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andreasm...@apache.org
Subject svn commit: r465608 - in /incubator/cxf/trunk: rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java systests/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTest.java
Date Thu, 19 Oct 2006 12:33:39 GMT
Author: andreasmyth
Date: Thu Oct 19 05:33:38 2006
New Revision: 465608

URL: http://svn.apache.org/viewvc?view=rev&rev=465608
Log:
Fixed correlation and re-enabled WS-addressing system test.

Modified:
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTest.java

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?view=diff&rev=465608&r1=465607&r2=465608
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Thu
Oct 19 05:33:38 2006
@@ -242,8 +242,10 @@
             chain.doIntercept(message);
         } finally {
             synchronized (message.getExchange()) {
-                message.getExchange().put(FINISHED, Boolean.TRUE);
-                message.getExchange().notifyAll();
+                if (!isPartialResponse(message)) {
+                    message.getExchange().put(FINISHED, Boolean.TRUE);
+                    message.getExchange().notifyAll();
+                }
             }
         }
     }
@@ -296,5 +298,10 @@
 
     public void setSynchronousTimeout(int synchronousTimeout) {
         this.synchronousTimeout = synchronousTimeout;
+    }
+
+    private boolean isPartialResponse(Message in) {
+        return in.getContent(List.class) == null
+            && in.getContent(Exception.class) == null;
     }
 }

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTest.java?view=diff&rev=465608&r1=465607&r2=465608
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTest.java
(original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTest.java
Thu Oct 19 05:33:38 2006
@@ -132,7 +132,7 @@
 
     //--Tests
      
-    public void xtestImplicitMAPs() throws Exception {
+    public void testImplicitMAPs() throws Exception {
         try {
             String greeting = greeter.greetMe("implicit1");
             assertEquals("unexpected response received from service", 
@@ -247,7 +247,7 @@
         }
     }
 
-    public void xtestVersioning() throws Exception {
+    public void testVersioning() throws Exception {
         try {
             // expect two MAPs instances versioned with 200408, i.e. for both 
             // the partial and full responses



Mime
View raw message