Author: richard.opalka(a)jboss.com Date: 2009-03-19 12:14:35 -0400 (Thu, 19 Mar 2009) New Revision: 9632 Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java Log: [JBWS-2486] implementing hack Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java =================================================================== --- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java 2009-03-19 14:07:26 UTC (rev 9631) +++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java 2009-03-19 16:14:35 UTC (rev 9632) @@ -239,7 +239,10 @@ @Override public <T> T addAttachment(Class<T> clazz, Object obj) { - if (!clazz.equals(PreDestroyHolder.class)) // JBWS-2268 hack + boolean isPreDestroyHolderClass = clazz.equals(PreDestroyHolder.class); // JBWS-2268 hack + boolean isObjectClass = clazz.equals(Object.class); // JBWS-2486 hack + + if (!isPreDestroyHolderClass && !isObjectClass) { assertEndpointSetterAccess(); } @@ -249,7 +252,10 @@ @Override public <T> T removeAttachment(Class<T> key) { - if (!key.equals(PreDestroyHolder.class)) // JBWS-2268 hack + boolean isPreDestroyHolderClass = key.equals(PreDestroyHolder.class); // JBWS-2268 hack + boolean isObjectClass = key.equals(Object.class); // JBWS-2486 hack + + if (!isPreDestroyHolderClass && !isObjectClass) { assertEndpointSetterAccess(); }