From 6a05270b0f2060921527c1d9011ec452f08da633 Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Tue, 20 Mar 2012 06:08:45 +0200 Subject: [PATCH] improve handling of GemFire 6.5 TX exceptions --- .../data/gemfire/GemfireTransactionManager.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/org/springframework/data/gemfire/GemfireTransactionManager.java b/src/main/java/org/springframework/data/gemfire/GemfireTransactionManager.java index 8a0f2d45..d7c17f9f 100644 --- a/src/main/java/org/springframework/data/gemfire/GemfireTransactionManager.java +++ b/src/main/java/org/springframework/data/gemfire/GemfireTransactionManager.java @@ -30,7 +30,6 @@ import org.springframework.util.Assert; import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheTransactionManager; -import com.gemstone.gemfire.cache.CommitConflictException; import com.gemstone.gemfire.cache.Region; /** @@ -136,7 +135,7 @@ public class GemfireTransactionManager extends AbstractPlatformTransactionManage } catch (IllegalStateException ex) { throw new NoTransactionException( "No transaction associated with the current thread; are there multiple transaction managers ?", ex); - } catch (CommitConflictException ex) { + } catch (TransactionException ex) { throw new GemfireTransactionCommitException("Unexpected failure on commit of Cache local transaction", ex); } }