You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2011/04/13 16:31:43 UTC

svn commit: r1091801 - /tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java

Author: antelder
Date: Wed Apr 13 14:31:42 2011
New Revision: 1091801

URL: http://svn.apache.org/viewvc?rev=1091801&view=rev
Log:
This bug has been fixed in hazelcast now

Modified:
    tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java

Modified: tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java?rev=1091801&r1=1091800&r2=1091801&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java Wed Apr 13 14:31:42 2011
@@ -290,17 +290,16 @@ public class HazelcastEndpointRegistry e
             String localMemberAddr = hazelcastInstance.getCluster().getLocalMember().getInetSocketAddress().toString();
             String endpointURI = endpoint.getURI();
             
-// TODO: seems to be a txn bug in Hazelcast, see http://code.google.com/p/hazelcast/issues/detail?id=258 
-//            Transaction txn = hazelcastInstance.getTransaction();
-//            txn.begin();
-//            try {
+            Transaction txn = hazelcastInstance.getTransaction();
+            txn.begin();
+            try {
                 endpointOwners.remove(localMemberAddr, endpointURI);
                 endpointMap.remove(endpointURI);
-//                txn.commit();
-//            } catch (Throwable e) {
-//                txn.rollback();
-//                throw new ServiceRuntimeException(e);
-//            }
+                txn.commit();
+            } catch (Throwable e) {
+                txn.rollback();
+                throw new ServiceRuntimeException(e);
+            }
             localEndpoints.remove(endpointURI);
             logger.info("Removed endpoint - " + endpoint);
         }