Author: shawkins Date: 2012-05-04 14:29:47 -0400 (Fri, 04 May 2012) New Revision: 4057 Modified: trunk/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java Log: TEIID-2028 fix for npe during a merge Modified: trunk/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java =================================================================== --- trunk/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java 2012-05-04 18:06:14 UTC (rev 4056) +++ trunk/jboss-integration/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java 2012-05-04 18:29:47 UTC (rev 4057) @@ -494,7 +494,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);