[jboss-cvs] JBoss Messaging SVN: r2315 - in trunk: src/main/org/jboss/jms/tx and 2 other directories.

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

Author: ovidiu.feodorov at jboss.com
Date: 2007-02-14 19:07:02 -0500 (Wed, 14 Feb 2007)
New Revision: 2315

Modified:
   trunk/src/main/org/jboss/jms/server/ServerPeer.java
   trunk/src/main/org/jboss/jms/tx/ResourceManager.java
   trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/FailoverStatus.java
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java
Log:
minor reformatting

Modified: trunk/src/main/org/jboss/jms/server/ServerPeer.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/ServerPeer.java	2007-02-14 22:48:51 UTC (rev 2314)
+++ trunk/src/main/org/jboss/jms/server/ServerPeer.java	2007-02-15 00:07:02 UTC (rev 2315)
@@ -1446,12 +1446,13 @@
          {
             if (updatedReplicantMap != null && originatingNodeId == serverPeerID)
             {
-               FailoverStatus status = (FailoverStatus)updatedReplicantMap.get(new Integer(serverPeerID));
+               FailoverStatus status =
+                  (FailoverStatus)updatedReplicantMap.get(new Integer(serverPeerID));
                
                if (status != null && status.isFailingOver())
                {                     
-                  //We prompt txRepository to load any prepared txs - so we can take over responsibility for
-                  //in doubt transactions from other nodes
+                  // We prompt txRepository to load any prepared txs - so we can take over
+                  // responsibility for in doubt transactions from other nodes
                   try
                   {
                      txRepository.loadPreparedTransactions();
@@ -1465,7 +1466,8 @@
             
             synchronized (failoverStatusLock)
             {
-               log.debug(ServerPeer.this + ".FailoverListener got failover event, notifying those waiting on lock");
+               log.debug(ServerPeer.this +
+                  ".FailoverListener got failover event, notifying those waiting on lock");
                
                failoverStatusLock.notifyAll();
             }

Modified: trunk/src/main/org/jboss/jms/tx/ResourceManager.java
===================================================================
--- trunk/src/main/org/jboss/jms/tx/ResourceManager.java	2007-02-14 22:48:51 UTC (rev 2314)
+++ trunk/src/main/org/jboss/jms/tx/ResourceManager.java	2007-02-15 00:07:02 UTC (rev 2315)
@@ -336,7 +336,7 @@
       
       ClientTransaction tx = removeTxInternal(xid);
       
-      if (trace) { log.trace("Got tx: " + tx + " state " + tx.getState()); }
+      if (trace) { log.trace("got tx: " + tx + " state " + tx.getState()); }
           
       if (onePhase)
       {

Modified: trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/FailoverStatus.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/FailoverStatus.java	2007-02-14 22:48:51 UTC (rev 2314)
+++ trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/FailoverStatus.java	2007-02-15 00:07:02 UTC (rev 2315)
@@ -27,10 +27,8 @@
 import java.util.Set;
 
 /**
- * A FailoverStatus
+ * This class is a state machine for failover state for a node.
  *
- * This class is a state machine for failover state for a node
- *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java	2007-02-14 22:48:51 UTC (rev 2314)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java	2007-02-15 00:07:02 UTC (rev 2315)
@@ -10,7 +10,6 @@
 import org.jboss.test.messaging.tools.ServerManagement;
 import org.jboss.test.messaging.tools.aop.PoisonInterceptor;
 import org.jboss.jms.client.JBossConnection;
-import org.jboss.jms.client.FailoverListener;
 import org.jboss.jms.client.FailoverEvent;
 import org.jboss.jms.client.remoting.JMSRemotingConnection;
 import org.jboss.jms.client.state.ConnectionState;
@@ -26,8 +25,6 @@
 import javax.jms.DeliveryMode;
 import javax.jms.Message;
 
-import EDU.oswego.cs.dl.util.concurrent.LinkedQueue;
-
 import java.util.Enumeration;
 import java.util.Set;
 import java.util.HashSet;