Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 7655 invoked from network); 11 Aug 2010 02:30:08 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 11 Aug 2010 02:30:08 -0000 Received: (qmail 20009 invoked by uid 500); 11 Aug 2010 02:30:08 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 19914 invoked by uid 500); 11 Aug 2010 02:30:07 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 19907 invoked by uid 99); 11 Aug 2010 02:30:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Aug 2010 02:30:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Aug 2010 02:30:07 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3A47523889E1; Wed, 11 Aug 2010 02:28:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100811022850.3A47523889E1@eris.apache.org> 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; + } } } }