From 99fd46b7cfda6e357a955590741ecef42ed5832a Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Thu, 27 Jun 2013 09:15:08 +0200
Subject: Fix for orb check

---
 src/main/java/com/c2kernel/process/Gateway.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/com/c2kernel/process/Gateway.java b/src/main/java/com/c2kernel/process/Gateway.java
index fddda5c..8182bf8 100644
--- a/src/main/java/com/c2kernel/process/Gateway.java
+++ b/src/main/java/com/c2kernel/process/Gateway.java
@@ -349,8 +349,10 @@ public class Gateway
         Logger.closeConsole();
 
         // finally, destroy the ORB
-        orbDestroyed = true;
-        getORB().destroy();
+        if (!orbDestroyed) {
+        	getORB().destroy();
+        	orbDestroyed = true;
+        }
     }
 
     static public org.omg.CORBA.ORB getORB()
-- 
cgit v1.2.3