svn commit: r766117 - in /cxf/branches/2.1.x-fixes: ./ rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java

[dkulp]

Author: dkulp
Date: Fri Apr 17 18:59:54 2009
New Revision: 766117

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

........
  r766100 | dkulp | 2009-04-17 13:55:23 -0400 (Fri, 17 Apr 2009) | 2 lines
  
  Fix jaxrs tests
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    
cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 17 18:59:54 2009
@@ -1 +1 @@
-/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058
+/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100

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

Modified: 
cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=766117&r1=766116&r2=766117&view=diff
==============================================================================
--- 
cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
 (original)
+++ 
cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
 Fri Apr 17 18:59:54 2009
@@ -817,7 +817,7 @@
             CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));  
      
         if (null == headers) {
             headers = new LinkedHashMap<String, List<String>>();
-        } else {
+        } else if (headers instanceof HashMap) {
             headers = new LinkedHashMap<String, List<String>>(headers);
         }
         message.put(Message.PROTOCOL_HEADERS, headers);