[jboss-svn-commits] JBL Code SVN: r36581 - labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTS/orbportability/classes/com/arjuna/orbportability.

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

Author: jhalliday
Date: 2011-01-27 05:17:48 -0500 (Thu, 27 Jan 2011)
New Revision: 36581

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


Modified: labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/RootOA.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/RootOA.java	2011-01-27 10:05:04 UTC (rev 36580)
+++ labs/jbosstm/branches/JBOSSTS_4_6_1_GA_CP/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/RootOA.java	2011-01-27 10:17:48 UTC (rev 36581)
@@ -31,6 +31,7 @@
 
 package com.arjuna.orbportability;
 
+import org.omg.CORBA.OBJECT_NOT_EXIST;
 import org.omg.PortableServer.POA;
 import org.omg.PortableServer.Servant;
 import org.omg.CORBA.SystemException;
@@ -285,9 +286,13 @@
 	}
         catch (Exception e)
         {
-            if (opLogger.loggerI18N.isWarnEnabled())
-            {
-                opLogger.loggerI18N.warn( "com.arjuna.orbportability.OA.caughtexception" , new Object[] { "shutdownObject", e.toString() });
+            if(e instanceof OBJECT_NOT_EXIST) {
+                // ignore - probably something else shut down the POA already
+            } else {
+                if (opLogger.loggerI18N.isWarnEnabled())
+                {
+                    opLogger.loggerI18N.warn( "com.arjuna.orbportability.OA.caughtexception" , new Object[] { "shutdownObject", e.toString() });
+                }
             }
 
             result = false;