Fixed bug #2626

1 files changed, 19 insertions, 0 deletions

diff --git a/cpp/src/Freeze/TransactionalEvictorContext.cpp b/cpp/src/Freeze/TransactionalEvictorContext.cpp
index 9d88aeef073..d58dcec4986 100644
--- a/cpp/src/Freeze/TransactionalEvictorContext.cpp
+++ b/cpp/src/Freeze/TransactionalEvictorContext.cpp
@@ -272,6 +272,15 @@ Freeze::TransactionalEvictorContext::ServantHolder::ServantHolder() :
 
 Freeze::TransactionalEvictorContext::ServantHolder::~ServantHolder()
 {
+#ifdef __HP_aCC
+//
+// The HP aCC compiler has a tendency to run dtors several times when an exception is raised:
+// a very nasty bug!
+//
+    try
+    {
+#endif
+
     if(_ownBody && _body.ownServant)
     {
         const TransactionalEvictorContextPtr& ctx = *(_body.ctx);
@@ -292,6 +301,16 @@ Freeze::TransactionalEvictorContext::ServantHolder::~ServantHolder()
         }
         ctx->_stack.pop_front();
     }
+#ifdef __HP_aCC
+    _body.rec.servant = 0;
+    }
+    catch(...)
+    {
+	_body.rec.servant = 0;
+	throw;
+    }
+#endif
+
 }