Author: shawkins Date: 2012-05-10 08:34:17 -0400 (Thu, 10 May 2012) New Revision: 4091 Modified: branches/7.7.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java Log: TEIID-2028 fix for npe Modified: branches/7.7.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java =================================================================== --- branches/7.7.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java 2012-05-10 12:31:45 UTC (rev 4090) +++ branches/7.7.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java 2012-05-10 12:34:17 UTC (rev 4091) @@ -298,7 +298,7 @@ } public void stop(Object object) { - if (!Proxy.isProxyClass(object.getClass())) { + if (object == null || !Proxy.isProxyClass(object.getClass())) { return; } ReplicatedInvocationHandler<?> handler = (ReplicatedInvocationHandler<?>) Proxy.getInvocationHandler(object);