From 90dd4b8b33fdbb23134ed21ab28acc7fc073ba54 Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Tue, 20 Mar 2012 06:14:11 +0200 Subject: [PATCH] backport from 1.1.x 18761a8c - 6a05270b GemfireTransactionCommitException should extend Spring's extension SGF-84 improve handling of GemFire 6.5 TX exceptions --- .../gemfire/GemfireTransactionCommitException.java | 10 +--------- .../data/gemfire/GemfireTransactionManager.java | 3 +-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/springframework/data/gemfire/GemfireTransactionCommitException.java b/src/main/java/org/springframework/data/gemfire/GemfireTransactionCommitException.java index d9c1f0ef..d1545cde 100644 --- a/src/main/java/org/springframework/data/gemfire/GemfireTransactionCommitException.java +++ b/src/main/java/org/springframework/data/gemfire/GemfireTransactionCommitException.java @@ -16,7 +16,7 @@ package org.springframework.data.gemfire; -import com.gemstone.gemfire.cache.TransactionException; +import org.springframework.transaction.TransactionException; /** * Gemfire-specific subclass of {@link org.springframework.transaction.TransactionException}, indicating a transaction failure at commit time. @@ -25,10 +25,6 @@ import com.gemstone.gemfire.cache.TransactionException; */ public class GemfireTransactionCommitException extends TransactionException { - public GemfireTransactionCommitException() { - super(); - } - public GemfireTransactionCommitException(String message, Throwable cause) { super(message, cause); } @@ -36,8 +32,4 @@ public class GemfireTransactionCommitException extends TransactionException { public GemfireTransactionCommitException(String message) { super(message); } - - public GemfireTransactionCommitException(Throwable cause) { - super(cause); - } } 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); } }