AMD testing + minimal rollback on user exception support in AMD

1 files changed, 7 insertions, 1 deletions

diff --git a/cpp/src/Freeze/TransactionalEvictorContext.h b/cpp/src/Freeze/TransactionalEvictorContext.h
index f9bcb1aa375..12b2a2e8765 100644
--- a/cpp/src/Freeze/TransactionalEvictorContext.h
+++ b/cpp/src/Freeze/TransactionalEvictorContext.h
@@ -112,6 +112,8 @@ public:
 
     void checkDeadlockException();
 
+    bool clearUserException();
+
     void commit();
     void rollback();
 
@@ -145,12 +147,16 @@ private:
     bool _rollbackOnly;
 
     std::auto_ptr<DeadlockException> _deadlockException;
-
+  
     //
     // Protected by this
     //
     bool _deadlockExceptionDetected;
 
+    //
+    // Not protected (used only by dispatch thread)
+    //
+    bool _userExceptionDetected;
 };
 
 typedef IceUtil::Handle<TransactionalEvictorContext> TransactionalEvictorContextPtr;