[jboss-cvs] JBossAS SVN: r80312 - in branches/JBPAPP_4_2_0_GA_CP: cluster/src/main/org/jboss/invocation/unified/interfaces and 1 other directories.

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

Author: galder.zamarreno at jboss.com
Date: 2008-10-31 08:00:10 -0400 (Fri, 31 Oct 2008)
New Revision: 80312

Modified:
   branches/JBPAPP_4_2_0_GA_CP/cluster/src/main/org/jboss/invocation/jrmp/interfaces/JRMPInvokerProxyHA.java
   branches/JBPAPP_4_2_0_GA_CP/cluster/src/main/org/jboss/invocation/unified/interfaces/UnifiedInvokerHAProxy.java
   branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cluster/invokerha/AbstractInvokerHaTransactionSticky.java
Log:
[JBPAPP-1359] "Transaction sticky target not available" is now wrapped in ServiceUnavailableException.

Modified: branches/JBPAPP_4_2_0_GA_CP/cluster/src/main/org/jboss/invocation/jrmp/interfaces/JRMPInvokerProxyHA.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/cluster/src/main/org/jboss/invocation/jrmp/interfaces/JRMPInvokerProxyHA.java	2008-10-31 11:22:59 UTC (rev 80311)
+++ branches/JBPAPP_4_2_0_GA_CP/cluster/src/main/org/jboss/invocation/jrmp/interfaces/JRMPInvokerProxyHA.java	2008-10-31 12:00:10 UTC (rev 80312)
@@ -437,7 +437,7 @@
                }
                else
                {
-                  throw new ServerException("Transaction sticky target is no longer available, so invocation needs to be halted");
+                  throw new ServiceUnavailableException("Transaction sticky target is no longer available, so invocation needs to be halted");
                }
             }
          }

Modified: branches/JBPAPP_4_2_0_GA_CP/cluster/src/main/org/jboss/invocation/unified/interfaces/UnifiedInvokerHAProxy.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/cluster/src/main/org/jboss/invocation/unified/interfaces/UnifiedInvokerHAProxy.java	2008-10-31 11:22:59 UTC (rev 80311)
+++ branches/JBPAPP_4_2_0_GA_CP/cluster/src/main/org/jboss/invocation/unified/interfaces/UnifiedInvokerHAProxy.java	2008-10-31 12:00:10 UTC (rev 80312)
@@ -577,7 +577,7 @@
             }
             else
             {
-               throw new ServerException("Transaction sticky target is no longer available, so invocation needs to be halted");
+               throw new ServiceUnavailableException("Transaction sticky target is no longer available, so invocation needs to be halted");
             }
          }
       }

Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cluster/invokerha/AbstractInvokerHaTransactionSticky.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cluster/invokerha/AbstractInvokerHaTransactionSticky.java	2008-10-31 11:22:59 UTC (rev 80311)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cluster/invokerha/AbstractInvokerHaTransactionSticky.java	2008-10-31 12:00:10 UTC (rev 80312)
@@ -21,7 +21,6 @@
  */
 package org.jboss.test.cluster.invokerha;
 
-import java.rmi.ServerException;
 import java.rmi.server.UID;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -37,6 +36,7 @@
 import org.jboss.ha.framework.interfaces.TransactionStickyRoundRobin;
 import org.jboss.invocation.Invocation;
 import org.jboss.invocation.InvokerProxyHA;
+import org.jboss.invocation.ServiceUnavailableException;
 import org.jboss.logging.Logger;
 import org.jboss.test.cluster.invokerha.InvokerHaTransactionalMockUtils.MockTransaction;
 
@@ -307,7 +307,7 @@
       catch(Exception e)
       {
          log.debug("Expected exception", e);
-         assertTrue(e instanceof ServerException || e.getCause() instanceof ServerException);
+         assertTrue(e instanceof ServiceUnavailableException || e.getCause() instanceof ServiceUnavailableException);
       }
    }