Author: pete.muir(a)jboss.org Date: 2010-03-04 16:08:12 -0500 (Thu, 04 Mar 2010) New Revision: 6002 Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyMethodHandler.java core/trunk/impl/src/main/java/org/jboss/weld/util/Proxies.java Log: fix method filter Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyMethodHandler.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyMethodHandler.java 2010-03-04 20:57:38 UTC (rev 6001) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyMethodHandler.java 2010-03-04 21:08:12 UTC (rev 6002) @@ -93,11 +93,6 @@ */ public Object invoke(Object self, Method proxiedMethod, Method proceed, Object[] args) throws Throwable { - // FIXME: Temporary fix until we have serializable method filters - if (proxiedMethod.getName().equals("finalize")) - { - return null; - } if (bean == null) { bean = Container.instance().services().get(ContextualStore.class).<Bean<Object>, Object>getContextual(id); Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/Proxies.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/util/Proxies.java 2010-03-04 20:57:38 UTC (rev 6001) +++ core/trunk/impl/src/main/java/org/jboss/weld/util/Proxies.java 2010-03-04 21:08:12 UTC (rev 6002) @@ -54,7 +54,7 @@ public boolean isHandled(Method m) { - return m.getName().equals("finalize"); + return !m.getName().equals("finalize"); } } @@ -103,9 +103,8 @@ public ProxyFactory createProxyFactory() { ProxyFactory proxyFactory = new ProxyFactory(); - ProxyFactory.useCache = false; -// FIXME: Check for calls to "finalize" in ClientProxyMethodHandler until serialization stuff is sorted out -// proxyFactory.setFilter(new IgnoreFinalizeMethodFilter()); + ProxyFactory.useCache = false; + proxyFactory.setFilter(new IgnoreFinalizeMethodFilter()); Class<?> superClass = getSuperClass(); if(superClass != null && superClass != Object.class) {