cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r541943 - in /incubator/cxf/trunk/rt: core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/ContextPropertiesMapping.java
Date Sat, 26 May 2007 21:58:56 GMT
Author: dkulp
Date: Sat May 26 14:58:55 2007
New Revision: 541943

URL: http://svn.apache.org/viewvc?view=rev&rev=541943
Log:
Close a stream, fix some property scopings

Modified:
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/ContextPropertiesMapping.java

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java?view=diff&rev=541943&r1=541942&r2=541943
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
(original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
Sat May 26 14:58:55 2007
@@ -201,6 +201,7 @@
         loaded.add(input);
         CachedOutputStream out = new CachedOutputStream();
         IOUtils.copy(input, out);
+        out.close();
         input.setInputStream(out.getInputStream());
     }
 

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/ContextPropertiesMapping.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/ContextPropertiesMapping.java?view=diff&rev=541943&r1=541942&r2=541943
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/ContextPropertiesMapping.java
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/ContextPropertiesMapping.java
Sat May 26 14:58:55 2007
@@ -162,7 +162,7 @@
     }
 
     public static void mapCxf2Jaxws(Exchange exchange, WrappedMessageContext ctx, boolean
requestor) {
-        mapCxf2Jaxws(ctx);        
+        mapCxf2Jaxws(ctx.getWrappedMessage());        
         Message inMessage = exchange.getInMessage();
         Message outMessage = exchange.getOutMessage();
         
@@ -181,9 +181,11 @@
                 inMessage.get(Message.PROTOCOL_HEADERS);
             if (null != inHeaders) {
                 if (requestor) {
-                    ctx.put(MessageContext.HTTP_RESPONSE_HEADERS, inHeaders);
+                    ctx.getWrappedMessage().put(MessageContext.HTTP_RESPONSE_HEADERS,
+                                                inHeaders);
                 } else {
-                    ctx.put(MessageContext.HTTP_REQUEST_HEADERS, inHeaders);            
       
+                    ctx.getWrappedMessage().put(MessageContext.HTTP_REQUEST_HEADERS,
+                                                inHeaders);                    
                 }
             
                 outMessage = exchange.getOutMessage();
@@ -204,7 +206,7 @@
                 outMessage.get(Message.PROTOCOL_HEADERS);
             
             if (outHeaders != null && !requestor) {
-                ctx.put(MessageContext.HTTP_REQUEST_HEADERS, outHeaders);
+                ctx.getWrappedMessage().put(MessageContext.HTTP_REQUEST_HEADERS, outHeaders);
             }
         }
 



Mime
View raw message