Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d0b7c40c Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d0b7c40c Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d0b7c40c Branch: refs/heads/3.1.x-fixes Commit: d0b7c40c4e014dcd3eebee1208a38f6441426911 Parents: d83e6ea Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Mon Feb 27 12:51:38 2017 +0000 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Mon Feb 27 12:51:38 2017 +0000 ---------------------------------------------------------------------- .../security/wss4j/CryptoCoverageChecker.java | 30 +------------------- 1 file changed, 1 insertion(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/d0b7c40c/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java index dff68e6..2fb7921 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/CryptoCoverageChecker.java @@ -136,35 +136,8 @@ public class CryptoCoverageChecker extends AbstractSoapInterceptor { List<WSHandlerResult> results = CastUtils.cast( (List<?>) message.get(WSHandlerConstants.RECV_RESULTS)); - // Get all encrypted and signed references -<<<<<<< HEAD - for (WSHandlerResult wshr : results) { - List<WSSecurityEngineResult> signedResults = wshr.getActionResults().get(WSConstants.SIGN); - if (signedResults != null) { - for (WSSecurityEngineResult signedResult : signedResults) { - List<WSDataRef> sl = - CastUtils.cast((List<?>)signedResult.get(WSSecurityEngineResult.TAG_DATA_REF_URIS)); - if (sl != null) { - if (sl.size() == 1 - && sl.get(0).getName().equals(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN))) { - //endorsing the signature so don't include - continue; - } - - signed.addAll(sl); - } - } - } - - List<WSSecurityEngineResult> encryptedResults = wshr.getActionResults().get(WSConstants.ENCR); - if (encryptedResults != null) { - for (WSSecurityEngineResult encryptedResult : encryptedResults) { - List<WSDataRef> el = - CastUtils.cast((List<?>)encryptedResult.get(WSSecurityEngineResult.TAG_DATA_REF_URIS)); - if (el != null) { - encrypted.addAll(el); -======= if (results != null) { + // Get all encrypted and signed references for (WSHandlerResult wshr : results) { List<WSSecurityEngineResult> signedResults = wshr.getActionResults().get(WSConstants.SIGN); if (signedResults != null) { @@ -191,7 +164,6 @@ public class CryptoCoverageChecker extends AbstractSoapInterceptor { if (el != null) { encrypted.addAll(el); } ->>>>>>> 156b166... NPE fix } } }
