[jboss-svn-commits] JBL Code SVN: r36575 - labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability.

[jboss-svn-commits at lists.jboss.org]

Author: jhalliday
Date: 2011-01-25 09:57:31 -0500 (Tue, 25 Jan 2011)
New Revision: 36575

Modified:
   labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/RootOA.java
Log:
supress orb shutdown warning. JBTM-824


Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/RootOA.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/RootOA.java	2011-01-24 21:01:18 UTC (rev 36574)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/RootOA.java	2011-01-25 14:57:31 UTC (rev 36575)
@@ -31,6 +31,7 @@
 
 package com.arjuna.orbportability;
 
+import org.omg.CORBA.OBJECT_NOT_EXIST;
 import org.omg.PortableServer.Servant;
 import org.omg.CORBA.SystemException;
 
@@ -256,9 +257,13 @@
 	}
         catch (Exception e)
         {
-            opLogger.i18NLogger.warn_OA_caughtexception("shutdownObject", e);
+            if(e instanceof OBJECT_NOT_EXIST) {
+                // ignore - probably something else shut down the POA already
+            } else {
+                opLogger.i18NLogger.warn_OA_caughtexception("shutdownObject", e);
 
-            result = false;
+                result = false;
+            }
         }
 
         return result;