You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2014/07/13 17:36:04 UTC
svn commit: r1610243 - in /axis/axis2/java/rampart/trunk:
modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
pom.xml
Author: veithen
Date: Sun Jul 13 15:36:04 2014
New Revision: 1610243
URL: http://svn.apache.org/r1610243
Log:
RAMPART-415: Apply Detelin Yordanov's patch to make Rampart compatible with WSS4J 1.6.16.
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
axis/axis2/java/rampart/trunk/pom.xml
Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java?rev=1610243&r1=1610242&r2=1610243&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java Sun Jul 13 15:36:04 2014
@@ -1472,7 +1472,12 @@ public class RampartUtil {
String encrKeyId = (String) wsSecEngineResult.get(WSSecurityEngineResult.TAG_ID);
if (actInt == WSConstants.ENCR &&
encrKeyId != null) {
- return encrKeyId;
+ if (encrKeyId.length() > 0) {
+ return encrKeyId;
+ }
+ else if (log.isDebugEnabled()) {
+ log.debug("Found encryption security processing result with empty id, skipping it: " + wsSecEngineResult);
+ }
}
}
}
Modified: axis/axis2/java/rampart/trunk/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=1610243&r1=1610242&r2=1610243&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/pom.xml Sun Jul 13 15:36:04 2014
@@ -529,7 +529,7 @@
<axis2.version>1.7.0-SNAPSHOT</axis2.version>
<axiom.version>1.2.15-SNAPSHOT</axiom.version>
- <wss4j.version>1.6.4</wss4j.version>
+ <wss4j.version>1.6.16</wss4j.version>
<opensaml.version>2.5.1-1</opensaml.version>
<bcprov.jdk15.version>140</bcprov.jdk15.version>