cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r790295 - in /cxf/branches/2.2.x-fixes: ./ rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/ rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/ rt/core/src/main/java/org/apache/cxf/endpoint/ systests/ sys...
Date Wed, 01 Jul 2009 18:13:18 GMT
Author: dkulp
Date: Wed Jul  1 18:13:17 2009
New Revision: 790295

URL: http://svn.apache.org/viewvc?rev=790295&view=rev
Log:
Merged revisions 790294 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r790294 | dkulp | 2009-07-01 14:10:48 -0400 (Wed, 01 Jul 2009) | 2 lines
  
  [CXF-2328] Fix issues with Corba binding not deserializing/mapping user
  exceptions properly.
........

Added:
    cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/corba/BaseGreeterImpl.java
      - copied unchanged from r790294, cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/BaseGreeterImpl.java
    cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/corba/CorbaTest.java
      - copied unchanged from r790294, cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/CorbaTest.java
    cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/corba/Server.java
      - copied unchanged from r790294, cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/Server.java
    cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/corba/hello_world_client.xml
      - copied unchanged from r790294, cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/hello_world_client.xml
    cxf/branches/2.2.x-fixes/systests/src/test/java/org/apache/cxf/systest/corba/hello_world_server.xml
      - copied unchanged from r790294, cxf/trunk/systests/src/test/java/org/apache/cxf/systest/corba/hello_world_server.xml
    cxf/branches/2.2.x-fixes/systests/src/test/resources/wsdl_systest/hello_world_corba.wsdl
      - copied unchanged from r790294, cxf/trunk/systests/src/test/resources/wsdl_systest/hello_world_corba.wsdl
Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
    cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java
    cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
    cxf/branches/2.2.x-fixes/systests/pom.xml

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul  1 18:13:17 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java?rev=790295&r1=790294&r2=790295&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
Wed Jul  1 18:13:17 2009
@@ -391,11 +391,9 @@
             if (corbaMsg.getStreamableException() != null) {
                 exchange.setInFaultMessage(corbaMsg);
                 inCorbaMsg.setStreamableException(corbaMsg.getStreamableException());
-                inCorbaMsg.setContent(Exception.class, corbaMsg.getContent(Exception.class));
             } else if (corbaMsg.getSystemException() != null) {
                 exchange.setInFaultMessage(corbaMsg);
                 inCorbaMsg.setSystemException(corbaMsg.getSystemException());
-                inCorbaMsg.setContent(Exception.class, corbaMsg.getContent(Exception.class));
             }
             LOG.log(Level.FINE, "incoming observer is " + incomingObserver);
             incomingObserver.onMessage((Message)inCorbaMsg);

Modified: cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java?rev=790295&r1=790294&r2=790295&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java
Wed Jul  1 18:13:17 2009
@@ -91,6 +91,9 @@
 
         CorbaMessage message = (CorbaMessage)msg;
         if (message.getStreamableException() != null || message.getSystemException() != null)
{
+            message.setContent(Exception.class, 
+                               message.getExchange().getOutMessage().getContent(Exception.class));
+
             Endpoint ep = message.getExchange().get(Endpoint.class);
             message.getInterceptorChain().abort();
             if (ep.getInFaultObserver() != null) {

Modified: cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=790295&r1=790294&r2=790295&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
Wed Jul  1 18:13:17 2009
@@ -640,7 +640,7 @@
             } else if (startingInterceptorID != null) {
                 chain.doInterceptStartingAt(message, startingInterceptorID);
             } else if (message.getContent(Exception.class) != null) {
-                chain.getFaultObserver().onMessage(message);
+                outFaultObserver.onMessage(message);
             } else {
                 chain.doIntercept(message);
             }

Modified: cxf/branches/2.2.x-fixes/systests/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/pom.xml?rev=790295&r1=790294&r2=790295&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/systests/pom.xml Wed Jul  1 18:13:17 2009
@@ -124,6 +124,21 @@
                         </goals>
                     </execution>
                     <execution>
+                        <id>generate-corba-test-sources</id>
+                        <phase>generate-test-sources</phase>
+                        <configuration>
+                            <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
+                            <wsdlOptions>
+                                <wsdlOption>
+                                    <wsdl>${basedir}/src/test/resources/wsdl_systest/hello_world_corba.wsdl</wsdl>
+                                </wsdlOption>
+                            </wsdlOptions>
+                        </configuration>
+                        <goals>
+                            <goal>wsdl2java</goal>
+                        </goals>
+                    </execution>
+                    <execution>
                         <id>generate-wssec10-test-sources</id>
                         <phase>generate-test-sources</phase>
                         <configuration>



Mime
View raw message