Author: heiko.braun(a)jboss.com Date: 2007-07-09 12:58:25 -0400 (Mon, 09 Jul 2007) New Revision: 3829 Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java Log: svn merge -r 3756:3758 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0 Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java 2007-07-09 16:56:38 UTC (rev 3828) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java 2007-07-09 16:58:25 UTC (rev 3829) @@ -53,7 +53,7 @@ import org.jboss.ws.core.jaxrpc.binding.QNameSerializerFactory; import org.jboss.ws.core.jaxrpc.binding.SimpleDeserializerFactory; import org.jboss.ws.core.jaxrpc.binding.SimpleSerializerFactory; -import org.jboss.wsf.spi.utils.HashCodeUtil; +import org.jboss.ws.core.utils.HashCodeUtil; import org.jboss.wsf.spi.utils.JavaUtils; /** Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java 2007-07-09 16:56:38 UTC (rev 3828) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java 2007-07-09 16:58:25 UTC (rev 3829) @@ -53,7 +53,7 @@ fail("It should not be possible to change bindinig customizations on a started endpoint"); } - catch (IllegalAccessError e) + catch (Exception e) { // all fine, this should happen }