cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1062014 - in /cxf/branches/2.3.x-fixes: ./ rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
Date Fri, 21 Jan 2011 20:35:37 GMT
Author: dkulp
Date: Fri Jan 21 20:35:36 2011
New Revision: 1062014

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

........
  r1062011 | dkulp | 2011-01-21 15:31:54 -0500 (Fri, 21 Jan 2011) | 1 line
  
  [CXF-3170] Also put a GET guard on WSS4JInInterceptor
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java

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

Modified: cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java?rev=1062014&r1=1062013&r2=1062014&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
Fri Jan 21 20:35:36 2011
@@ -146,9 +146,13 @@ public class WSS4JInInterceptor extends 
         }               
         return result;
     }
+    public final boolean isGET(SoapMessage message) {
+        String method = (String)message.get(SoapMessage.HTTP_REQUEST_METHOD);
+        return "GET".equals(method) && message.getContent(XMLStreamReader.class)
== null;
+    }
     
     public void handleMessage(SoapMessage msg) throws Fault {
-        if (msg.containsKey(SECURITY_PROCESSED)) {
+        if (msg.containsKey(SECURITY_PROCESSED) || isGET(msg)) {
             return;
         }
         msg.put(SECURITY_PROCESSED, Boolean.TRUE);



Mime
View raw message