Return-Path: X-Original-To: apmail-tomee-commits-archive@www.apache.org Delivered-To: apmail-tomee-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 8277B17DD0 for ; Tue, 4 Nov 2014 21:40:17 +0000 (UTC) Received: (qmail 29512 invoked by uid 500); 4 Nov 2014 21:40:17 -0000 Delivered-To: apmail-tomee-commits-archive@tomee.apache.org Received: (qmail 29486 invoked by uid 500); 4 Nov 2014 21:40:17 -0000 Mailing-List: contact commits-help@tomee.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tomee.apache.org Delivered-To: mailing list commits@tomee.apache.org Received: (qmail 29476 invoked by uid 99); 4 Nov 2014 21:40:17 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Nov 2014 21:40:17 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E1A43932119; Tue, 4 Nov 2014 21:40:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rmannibucau@apache.org To: commits@tomee.apache.org Message-Id: <4d6f48ac84314221a814d71d02ebca09@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: TOMEE-1438 delegate equals/hashcode for cxf loader Date: Tue, 4 Nov 2014 21:40:16 +0000 (UTC) Repository: tomee Updated Branches: refs/heads/develop c130214b9 -> fb3e1d680 TOMEE-1438 delegate equals/hashcode for cxf loader Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/fb3e1d68 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/fb3e1d68 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/fb3e1d68 Branch: refs/heads/develop Commit: fb3e1d68062eafd6627884457bd5da6b95697272 Parents: c130214 Author: Romain Manni-Bucau Authored: Tue Nov 4 21:38:15 2014 +0000 Committer: Romain Manni-Bucau Committed: Tue Nov 4 21:38:15 2014 +0000 ---------------------------------------------------------------------- .../cxf/transport/util/CxfContainerClassLoader.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/fb3e1d68/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfContainerClassLoader.java ---------------------------------------------------------------------- diff --git a/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfContainerClassLoader.java b/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfContainerClassLoader.java index 5b74e8b..8961a17 100644 --- a/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfContainerClassLoader.java +++ b/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfContainerClassLoader.java @@ -115,18 +115,18 @@ public class CxfContainerClassLoader extends ClassLoader { @Override public boolean equals(final Object o) { final ClassLoader classLoader = tccl(); - if (classLoader != null) { - return classLoader.equals(o); + if (classLoader == null || CxfContainerClassLoader.class.isInstance(classLoader)) { // avoid loop + return CONTAINER_LOADER.equals(o); } - return CONTAINER_LOADER.equals(o); + return classLoader.equals(o); } @Override public int hashCode() { final ClassLoader classLoader = tccl(); - if (classLoader != null) { - return classLoader.hashCode(); + if (classLoader == null || CxfContainerClassLoader.class.isInstance(classLoader)) { // avoid loop + return CONTAINER_LOADER.hashCode(); } - return CONTAINER_LOADER.hashCode(); + return classLoader.hashCode(); } }