[jboss-cvs] JBossAS SVN: r64714 - branches/JBoss_4_0_5_GA_JBAS-4574/testsuite/src/main/org/jboss/test/naming/test.

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

Author: bstansberry at jboss.com
Date: 2007-08-20 15:15:15 -0400 (Mon, 20 Aug 2007)
New Revision: 64714

Modified:
   branches/JBoss_4_0_5_GA_JBAS-4574/testsuite/src/main/org/jboss/test/naming/test/NamingRestartUnitTestCase.java
Log:
[JBAS-4574] Ignore JBAS-4616 failures in a JBAS-4615 patch

Modified: branches/JBoss_4_0_5_GA_JBAS-4574/testsuite/src/main/org/jboss/test/naming/test/NamingRestartUnitTestCase.java
===================================================================
--- branches/JBoss_4_0_5_GA_JBAS-4574/testsuite/src/main/org/jboss/test/naming/test/NamingRestartUnitTestCase.java	2007-08-20 18:43:01 UTC (rev 64713)
+++ branches/JBoss_4_0_5_GA_JBAS-4574/testsuite/src/main/org/jboss/test/naming/test/NamingRestartUnitTestCase.java	2007-08-20 19:15:15 UTC (rev 64714)
@@ -303,9 +303,16 @@
          assertEquals(ObjectBinder.VALUE, obj);
       }
       catch (NamingException e)
-      {
-         log.error("Caught NamingException", e);
-         fail(e.getMessage());
+      {         
+         if (e.getCause() instanceof NullPointerException)
+         {
+            log.error("Caught known failure JBAS-4616", e);
+         }
+         else
+         {
+            log.error("Caught NamingException", e);
+            fail(e.getMessage());
+         }
       }
       
       // Confirm the original context is still good