svn commit: r1164596 - in /cxf/branches/2.4.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java

[dkulp]

Author: dkulp
Date: Fri Sep  2 15:59:06 2011
New Revision: 1164596

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

........
  r1164588 | dkulp | 2011-09-02 11:53:30 -0400 (Fri, 02 Sep 2011) | 2 lines
  
  [CXF-3790, CXF-3789] Remove some no-op crufty code
  Patches from Gary Gregory applied
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
    
cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java

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

Modified: 
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=1164596&r1=1164595&r2=1164596&view=diff
==============================================================================
--- 
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
 (original)
+++ 
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
 Fri Sep  2 15:59:06 2011
@@ -359,7 +359,6 @@ public class ClientImpl
                            Exchange exchange) throws Exception {
         Map<String, Object> context = new HashMap<String, Object>();
         Map<String, Object> resp = new HashMap<String, Object>();
-        resp.clear();
         Map<String, Object> req = new HashMap<String, 
Object>(getRequestContext());
         context.put(RESPONSE_CONTEXT, resp);
         context.put(REQUEST_CONTEXT, req);

Modified: 
cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java?rev=1164596&r1=1164595&r2=1164596&view=diff
==============================================================================
--- 
cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
 (original)
+++ 
cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
 Fri Sep  2 15:59:06 2011
@@ -95,12 +95,10 @@ public class WrapperClassInInterceptor e
             if (lst == null) {
                 return;
             }
-            if (lst != null) {
-                message.put(MessageInfo.class, messageInfo);
-                message.put(BindingMessageInfo.class, bmi);
-                ex.put(BindingOperationInfo.class, boi2);
-                ex.put(OperationInfo.class, op);
-            }
+            message.put(MessageInfo.class, messageInfo);
+            message.put(BindingMessageInfo.class, bmi);
+            ex.put(BindingOperationInfo.class, boi2);
+            ex.put(OperationInfo.class, op);
             
             if (isGET(message)) {
                 LOG.fine("WrapperClassInInterceptor skipped in HTTP GET 
method");