svn commit: r1164588 - in /cxf/trunk/rt: core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java

[dkulp]

Author: dkulp
Date: Fri Sep  2 15:53:30 2011
New Revision: 1164588

URL: http://svn.apache.org/viewvc?rev=1164588&view=rev
Log:
[CXF-3790, CXF-3789] Remove some no-op crufty code
Patches from Gary Gregory applied

Modified:
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
    
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java

Modified: 
cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=1164588&r1=1164587&r2=1164588&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java 
(original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Fri 
Sep  2 15:53:30 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/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java?rev=1164588&r1=1164587&r2=1164588&view=diff
==============================================================================
--- 
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
 (original)
+++ 
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassInInterceptor.java
 Fri Sep  2 15:53:30 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");