Author: alessio.soldano(a)jboss.com Date: 2009-05-19 05:23:07 -0400 (Tue, 19 May 2009) New Revision: 10058 Modified: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11ServerHandler.java framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12ServerHandler.java Log: svn merge -r 10056:HEAD https://svn.jboss.org/repos/jbossws/framework/trunk Modified: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11ServerHandler.java =================================================================== --- framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11ServerHandler.java 2009-05-19 09:21:45 UTC (rev 10057) +++ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11ServerHandler.java 2009-05-19 09:23:07 UTC (rev 10058) @@ -22,6 +22,7 @@ package org.jboss.test.ws.jaxws.jbws2419; import java.util.ArrayList; +import java.util.List; import java.util.Map; import javax.mail.internet.ContentType; @@ -94,8 +95,8 @@ try { //Metro does not process this header into the message - Map<String,ArrayList> headers = (Map)msgContext.get(MessageContext.HTTP_REQUEST_HEADERS); - ArrayList<String> ctype = (headers == null) ? null : headers.get("Content-Type"); + Map<String,List<String>> headers = (Map)msgContext.get(MessageContext.HTTP_REQUEST_HEADERS); + List<String> ctype = (headers == null) ? null : headers.get("Content-Type"); if (ctype == null) { //Cxf stores it in lower case Modified: framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12ServerHandler.java =================================================================== --- framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12ServerHandler.java 2009-05-19 09:21:45 UTC (rev 10057) +++ framework/branches/jbossws-framework-3.1.2/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12ServerHandler.java 2009-05-19 09:23:07 UTC (rev 10058) @@ -22,6 +22,7 @@ package org.jboss.test.ws.jaxws.jbws2419; import java.util.ArrayList; +import java.util.List; import java.util.Map; import javax.mail.internet.ContentType; @@ -94,8 +95,8 @@ try { //Metro does not process this header into the message - Map<String,ArrayList> headers = (Map)msgContext.get(MessageContext.HTTP_REQUEST_HEADERS); - ArrayList<String> ctype = (headers == null) ? null : headers.get("Content-Type"); + Map<String,List<String>> headers = (Map)msgContext.get(MessageContext.HTTP_REQUEST_HEADERS); + List<String> ctype = (headers == null) ? null : headers.get("Content-Type"); if (ctype == null) { //Cxf stores it in lower case