svn commit: r1614128 - /axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllReceiver.java

[veithen]

Author: veithen
Date: Mon Jul 28 18:57:24 2014
New Revision: 1614128

URL: http://svn.apache.org/r1614128
Log:
RAMPART-415: Applied the 1.6 specific part of the patch provided by Detelin 
Yordanov.

Modified:
    
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllReceiver.java

Modified: 
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllReceiver.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllReceiver.java?rev=1614128&r1=1614127&r2=1614128&view=diff
==============================================================================
--- 
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllReceiver.java
 (original)
+++ 
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllReceiver.java
 Mon Jul 28 18:57:24 2014
@@ -384,5 +384,16 @@ public class WSDoAllReceiver extends WSD
             }
         }
     }
+    
+    protected void doReceiverAction(int doAction, RequestData reqData)
+        throws WSSecurityException {
+        //backward compatibility, allow username tokens without password per 
default
+        //see https://issues.apache.org/jira/browse/WSS-420
+        Object msgContext = reqData.getMsgContext();
+        if (getProperty(msgContext, 
WSHandlerConstants.ALLOW_USERNAMETOKEN_NOPASSWORD) == null) {
+            setProperty(msgContext, 
WSHandlerConstants.ALLOW_USERNAMETOKEN_NOPASSWORD, "true");
+        }
+        super.doReceiverAction(doAction, reqData);
+    }
 
 }