Author: dkulp
Date: Wed Aug 11 01:38:01 2010
New Revision: 984279
URL: http://svn.apache.org/viewvc?rev=984279&view=rev
Log:
Add some ne guards
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java?rev=984279&r1=984278&r2=984279&view=diff
==============================================================================
---
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
(original)
+++
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
Wed Aug 11 01:38:01 2010
@@ -199,18 +199,20 @@ public class IssuedTokenInterceptorProvi
if (!isRequestor(message)) {
boolean found = false;
Vector results =
(Vector)message.get(WSHandlerConstants.RECV_RESULTS);
- for (int i = 0; i < results.size(); i++) {
- WSHandlerResult rResult =
- (WSHandlerResult) results.get(i);
-
- Vector wsSecEngineResults = rResult.getResults();
-
- for (int j = 0; j < wsSecEngineResults.size(); j++) {
- //WSSecurityEngineResult wser =
- // (WSSecurityEngineResult)
wsSecEngineResults.get(j);
- //Integer actInt =
(Integer)wser.get(WSSecurityEngineResult.TAG_ACTION);
- //how to find if it's due to an IssuedToken?
- found = true;
+ if (results != null) {
+ for (int i = 0; i < results.size(); i++) {
+ WSHandlerResult rResult =
+ (WSHandlerResult) results.get(i);
+
+ Vector wsSecEngineResults = rResult.getResults();
+
+ for (int j = 0; j < wsSecEngineResults.size();
j++) {
+ //WSSecurityEngineResult wser =
+ // (WSSecurityEngineResult)
wsSecEngineResults.get(j);
+ //Integer actInt =
(Integer)wser.get(WSSecurityEngineResult.TAG_ACTION);
+ //how to find if it's due to an IssuedToken?
+ found = true;
+ }
}
}
for (AssertionInfo inf : ais) {
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java?rev=984279&r1=984278&r2=984279&view=diff
==============================================================================
---
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
(original)
+++
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
Wed Aug 11 01:38:01 2010
@@ -450,22 +450,24 @@ class SecureConversationInInterceptor ex
//Find the SC token
boolean found = false;
List results = (List)message.get(WSHandlerConstants.RECV_RESULTS);
- for (int i = 0; i < results.size(); i++) {
- WSHandlerResult rResult =
- (WSHandlerResult) results.get(i);
-
- Vector wsSecEngineResults = rResult.getResults();
-
- for (int j = 0; j < wsSecEngineResults.size(); j++) {
- WSSecurityEngineResult wser =
- (WSSecurityEngineResult) wsSecEngineResults.get(j);
- Integer actInt =
(Integer)wser.get(WSSecurityEngineResult.TAG_ACTION);
- if (actInt.intValue() == WSConstants.SCT) {
- SecurityContextToken tok
- = (SecurityContextToken)wser
-
.get(WSSecurityEngineResult.TAG_SECURITY_CONTEXT_TOKEN);
- message.getExchange().put(SecurityConstants.TOKEN_ID,
tok.getIdentifier());
- found = true;
+ if (results != null) {
+ for (int i = 0; i < results.size(); i++) {
+ WSHandlerResult rResult =
+ (WSHandlerResult) results.get(i);
+
+ Vector wsSecEngineResults = rResult.getResults();
+
+ for (int j = 0; j < wsSecEngineResults.size(); j++) {
+ WSSecurityEngineResult wser =
+ (WSSecurityEngineResult)
wsSecEngineResults.get(j);
+ Integer actInt =
(Integer)wser.get(WSSecurityEngineResult.TAG_ACTION);
+ if (actInt.intValue() == WSConstants.SCT) {
+ SecurityContextToken tok
+ = (SecurityContextToken)wser
+
.get(WSSecurityEngineResult.TAG_SECURITY_CONTEXT_TOKEN);
+
message.getExchange().put(SecurityConstants.TOKEN_ID, tok.getIdentifier());
+ found = true;
+ }
}
}
}
