You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/02/27 12:49:55 UTC
cxf git commit: NPE fix
Repository: cxf
Updated Branches:
refs/heads/master 19cad14f4 -> 156b166b0
NPE fix
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/156b166b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/156b166b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/156b166b
Branch: refs/heads/master
Commit: 156b166b093aa92c1fc400e0f1f7440ded701169
Parents: 19cad14
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Feb 27 12:49:47 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Feb 27 12:49:47 2017 +0000
----------------------------------------------------------------------
.../security/wss4j/CryptoCoverageChecker.java | 44 ++++++++++----------
1 file changed, 23 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/156b166b/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 11ba8ec..bcca668 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
@@ -137,31 +137,33 @@ public class CryptoCoverageChecker extends AbstractSoapInterceptor {
(List<?>) message.get(WSHandlerConstants.RECV_RESULTS));
// Get all encrypted and signed references
- 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;
+ if (results != null) {
+ 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);
}
-
- 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);
+ 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);
+ }
}
}
}