cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r984288 - in /cxf/branches/2.2.x-fixes: ./ rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/
Date Wed, 11 Aug 2010 02:28:50 GMT
Author: dkulp
Date: Wed Aug 11 02:28:49 2010
New Revision: 984288

URL: http://svn.apache.org/viewvc?rev=984288&view=rev
Log:
Merged revisions 984279 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r984279 | dkulp | 2010-08-10 21:38:01 -0400 (Tue, 10 Aug 2010) | 1 line
  
  Add some ne guards
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
    cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java?rev=984288&r1=984287&r2=984288&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
Wed Aug 11 02:28:49 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/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java?rev=984288&r1=984287&r2=984288&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
Wed Aug 11 02:28:49 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;
+                        }
                     }
                 }
             }



Mime
View raw message