Author: dkulp Date: Wed Feb 13 17:09:00 2013 New Revision: 1445744 URL: http://svn.apache.org/r1445744 Log: Merged revisions 1445710 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1445710 | dkulp | 2013-02-13 11:26:29 -0500 (Wed, 13 Feb 2013) | 18 lines Merged revisions 1445374 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ........ r1445374 | dkulp | 2013-02-12 16:15:51 -0500 (Tue, 12 Feb 2013) | 10 lines Merged revisions 1443974 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1443974 | bimargulies | 2013-02-08 07:10:50 -0500 (Fri, 08 Feb 2013) | 2 lines CXF-4805: fix checkstyle, tolerate no verb at all. ........ ........ ........ Modified: cxf/branches/2.5.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java cxf/branches/2.5.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java cxf/branches/2.5.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestUtil.java cxf/branches/2.5.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java Modified: cxf/branches/2.5.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java?rev=1445744&r1=1445743&r2=1445744&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java (original) +++ cxf/branches/2.5.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java Wed Feb 13 17:09:00 2013 @@ -128,7 +128,8 @@ public class ReadHeadersInterceptor exte /* * Reject OPTIONS, and any other noise that is not allowed in SOAP. */ - if (!"POST".equals((String)message.get(org.apache.cxf.message.Message.HTTP_REQUEST_METHOD))) { + final String verb = (String) message.get(org.apache.cxf.message.Message.HTTP_REQUEST_METHOD); + if (verb != null && !"POST".equals(verb)) { Fault formula405 = new Fault("HTTP verb was not GET or POST", LOG); formula405.setStatusCode(405); throw formula405; Modified: cxf/branches/2.5.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java?rev=1445744&r1=1445743&r2=1445744&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java (original) +++ cxf/branches/2.5.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java Wed Feb 13 17:09:00 2013 @@ -29,7 +29,6 @@ import javax.activation.DataHandler; import javax.mail.util.ByteArrayDataSource; import javax.xml.stream.XMLStreamReader; -import org.apache.cxf.interceptor.Fault; import org.w3c.dom.Element; import org.apache.cxf.BusFactory; @@ -40,6 +39,7 @@ import org.apache.cxf.binding.soap.inter import org.apache.cxf.binding.soap.interceptor.StartBodyInterceptor; import org.apache.cxf.headers.Header; import org.apache.cxf.helpers.DOMUtils; +import org.apache.cxf.interceptor.Fault; import org.apache.cxf.interceptor.StaxInInterceptor; import org.apache.cxf.message.Attachment; import org.apache.cxf.message.Message; Modified: cxf/branches/2.5.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestUtil.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestUtil.java?rev=1445744&r1=1445743&r2=1445744&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestUtil.java (original) +++ cxf/branches/2.5.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestUtil.java Wed Feb 13 17:09:00 2013 @@ -31,7 +31,11 @@ import javax.mail.util.ByteArrayDataSour import org.apache.cxf.attachment.AttachmentImpl; import org.apache.cxf.attachment.AttachmentUtil; import org.apache.cxf.interceptor.InterceptorChain; -import org.apache.cxf.message.*; +import org.apache.cxf.message.Attachment; +import org.apache.cxf.message.Exchange; +import org.apache.cxf.message.ExchangeImpl; +import org.apache.cxf.message.Message; +import org.apache.cxf.message.MessageImpl; public final class TestUtil { Modified: cxf/branches/2.5.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java?rev=1445744&r1=1445743&r2=1445744&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java (original) +++ cxf/branches/2.5.x-fixes/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java Wed Feb 13 17:09:00 2013 @@ -28,7 +28,6 @@ import javax.xml.soap.SOAPPart; import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; -import org.apache.cxf.message.Message; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -45,6 +44,7 @@ import org.apache.cxf.binding.soap.saaj. import org.apache.cxf.helpers.DOMUtils; import org.apache.cxf.interceptor.Fault; import org.apache.cxf.message.ExchangeImpl; +import org.apache.cxf.message.Message; import org.apache.cxf.message.MessageImpl; import org.apache.cxf.staxutils.StaxUtils; import org.apache.cxf.test.AbstractCXFTest;
