Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 36CC292D3 for ; Fri, 10 Feb 2012 15:45:06 +0000 (UTC) Received: (qmail 70470 invoked by uid 500); 10 Feb 2012 15:45:06 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 70397 invoked by uid 500); 10 Feb 2012 15:45:05 -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 70390 invoked by uid 99); 10 Feb 2012 15:45:05 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Feb 2012 15:45:05 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Fri, 10 Feb 2012 15:45:03 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C61AC23889E7 for ; Fri, 10 Feb 2012 15:44:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1242826 - /cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java Date: Fri, 10 Feb 2012 15:44:42 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120210154442.C61AC23889E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: coheigea Date: Fri Feb 10 15:44:42 2012 New Revision: 1242826 URL: http://svn.apache.org/viewvc?rev=1242826&view=rev Log: [CXF-4092] - Confusing error message "No initiator token id" in AssymetricBindingHandler - Patch applied, thanks Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java?rev=1242826&r1=1242825&r2=1242826&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java (original) +++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java Fri Feb 10 15:44:42 2012 @@ -110,7 +110,7 @@ public class AsymmetricBindingHandler ex if (initiatorToken instanceof IssuedToken) { SecurityToken secToken = getSecurityToken(); if (secToken == null) { - policyNotAsserted(initiatorToken, "No intiator token id"); + policyNotAsserted(initiatorToken, "Security token is not found or expired"); return; } else { policyAsserted(initiatorToken); @@ -221,7 +221,7 @@ public class AsymmetricBindingHandler ex if (initiatorToken instanceof IssuedToken) { SecurityToken secToken = getSecurityToken(); if (secToken == null) { - policyNotAsserted(initiatorToken, "No intiator token id"); + policyNotAsserted(initiatorToken, "Security token is not found or expired"); return; } else { policyAsserted(initiatorToken);