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 5F38211F0B for ; Fri, 1 Aug 2014 16:10:12 +0000 (UTC) Received: (qmail 24249 invoked by uid 500); 1 Aug 2014 16:10:12 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 24078 invoked by uid 500); 1 Aug 2014 16:10:12 -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 24051 invoked by uid 99); 1 Aug 2014 16:10:12 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Aug 2014 16:10:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D66D19BD7DD; Fri, 1 Aug 2014 16:10:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@cxf.apache.org Date: Fri, 01 Aug 2014 16:10:12 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: [CXF-5908] - Making Claims clonable. Thanks to Jan Bernhardt for the patch [CXF-5908] - Making Claims clonable. Thanks to Jan Bernhardt for the patch Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/04bd7023 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/04bd7023 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/04bd7023 Branch: refs/heads/3.0.x-fixes Commit: 04bd702322b4efcf05b65af515c09c6e9a7cc764 Parents: 3544ff9 Author: Colm O hEigeartaigh Authored: Fri Aug 1 16:59:36 2014 +0100 Committer: Colm O hEigeartaigh Committed: Fri Aug 1 17:01:50 2014 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/cxf/rt/security/claims/Claim.java | 3 --- .../src/main/java/org/apache/cxf/sts/claims/ProcessedClaim.java | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/04bd7023/rt/security/src/main/java/org/apache/cxf/rt/security/claims/Claim.java ---------------------------------------------------------------------- diff --git a/rt/security/src/main/java/org/apache/cxf/rt/security/claims/Claim.java b/rt/security/src/main/java/org/apache/cxf/rt/security/claims/Claim.java index 9c56775..960bf75 100644 --- a/rt/security/src/main/java/org/apache/cxf/rt/security/claims/Claim.java +++ b/rt/security/src/main/java/org/apache/cxf/rt/security/claims/Claim.java @@ -131,9 +131,6 @@ public class Claim implements Serializable, Cloneable { if (this == obj) { return true; } - if (obj == null) { - return false; - } if (!(obj instanceof Claim)) { return false; } http://git-wip-us.apache.org/repos/asf/cxf/blob/04bd7023/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ProcessedClaim.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ProcessedClaim.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ProcessedClaim.java index b29404c..3374e99 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ProcessedClaim.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/claims/ProcessedClaim.java @@ -103,10 +103,10 @@ public class ProcessedClaim extends Claim { if (this == obj) { return true; } - if (!super.equals(obj)) { + if (!(obj instanceof ProcessedClaim)) { return false; } - if (!(obj instanceof ProcessedClaim)) { + if (!super.equals(obj)) { return false; } ProcessedClaim other = (ProcessedClaim)obj;