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 0C61110A20 for ; Mon, 2 Dec 2013 17:14:19 +0000 (UTC) Received: (qmail 12171 invoked by uid 500); 2 Dec 2013 17:06:26 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 6214 invoked by uid 500); 2 Dec 2013 17:04:30 -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 143 invoked by uid 99); 2 Dec 2013 16:53:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Dec 2013 16:53:57 +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; Mon, 02 Dec 2013 16:53:56 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 09BA7238888F; Mon, 2 Dec 2013 16:53:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1547103 - /cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java Date: Mon, 02 Dec 2013 16:53:35 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131202165336.09BA7238888F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: coheigea Date: Mon Dec 2 16:53:35 2013 New Revision: 1547103 URL: http://svn.apache.org/r1547103 Log: Merged revisions 1547083 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ........ r1547083 | coheigea | 2013-12-02 16:22:05 +0000 (Mon, 02 Dec 2013) | 10 lines Merged revisions 1547076 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1547076 | coheigea | 2013-12-02 16:04:56 +0000 (Mon, 02 Dec 2013) | 2 lines Don't serialize SecurityToken secrets ........ ........ Modified: cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java Modified: cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java?rev=1547103&r1=1547102&r2=1547103&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java (original) +++ cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java Mon Dec 2 16:53:35 2013 @@ -88,7 +88,7 @@ public class SecurityToken implements Se /** * The secret associated with the Token */ - private byte[] secret; + private transient byte[] secret; /** * Created time