[axis-axis2-java-rampart] 14/14: Merge latest changes from trunk.

[billblough]

This is an automated email from the ASF dual-hosted git repository.

billblough pushed a commit to branch RAMPART-426
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git

commit 8d31bd875af9e799ff93b902cccb3c196f622457
Merge: 86c6db7 fc03dfe
Author: Andreas Veithen <veit...@apache.org>
AuthorDate: Sun Jan 29 18:40:26 2017 +0000

    Merge latest changes from trunk.

 .../src/main/java/org/apache/rampart/RampartEngine.java        |  7 +------
 .../src/main/java/org/apache/rahas/STSMessageReceiver.java     | 10 +++-------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --cc 
modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
index 0c302ac,a4d612b..1b6fa29
--- a/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
+++ b/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
@@@ -234,21 -234,7 +234,16 @@@ public class RampartEngine 
                    }
                }
                
 -              String actorValue = secHeader.getRole();
 +              // get the configured 'actor' value and if it is NOT set
 +              // then fallback to the one in the security header
 +              String actorValue = null;
 +              if(null != rampartConfig){
 +                      actorValue = rampartConfig.getInboundActor();
 +              }
 +              
 +              if(null == actorValue){
-                   String actorAttribute = WSConstants.ATTR_ACTOR;
-                   if 
(WSConstants.URI_SOAP12_ENV.equals(rmd.getSoapConstants().getEnvelopeURI())) {
-                       actorAttribute = WSConstants.ATTR_ROLE;
-                   }
-                       
-                   actorValue = secHeader.getAttributeValue(new 
QName(rmd.getSoapConstants().getEnvelopeURI(), actorAttribute));
++                  actorValue = secHeader.getRole();
 +              }
  
                Crypto signatureCrypto = 
RampartUtil.getSignatureCrypto(rpd.getRampartConfig(), 
                        msgCtx.getAxisService().getClassLoader());