You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/04/03 23:10:23 UTC
svn commit: r1584397 -
/tomee/tomee/trunk/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfContainerClassLoader.java
Author: rmannibucau
Date: Thu Apr 3 21:10:23 2014
New Revision: 1584397
URL: http://svn.apache.org/r1584397
Log:
avoiding infinite loops when cxfcontainerclassloader is not well set up
Modified:
tomee/tomee/trunk/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfContainerClassLoader.java
Modified: tomee/tomee/trunk/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfContainerClassLoader.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfContainerClassLoader.java?rev=1584397&r1=1584396&r2=1584397&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfContainerClassLoader.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfContainerClassLoader.java Thu Apr 3 21:10:23 2014
@@ -116,11 +116,19 @@ public class CxfContainerClassLoader ext
@Override
public boolean equals(final Object o) {
- return tccl().equals(o);
+ final ClassLoader classLoader = tccl();
+ if (classLoader != null) { // avoid loop
+ return CONTAINER_LOADER.equals(o);
+ }
+ return classLoader.equals(o);
}
@Override
public int hashCode() {
- return tccl().hashCode();
+ final ClassLoader classLoader = tccl();
+ if (classLoader != null) { // avoid loop
+ return CONTAINER_LOADER.hashCode();
+ }
+ return classLoader.hashCode();
}
}