[jboss-cvs] JBoss Messaging SVN: r1989 - in trunk: src/main/org/jboss/jms/client/plugin and 10 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jan 18 22:24:03 EST 2007
Author: ovidiu.feodorov at jboss.com
Date: 2007-01-18 22:24:03 -0500 (Thu, 18 Jan 2007)
New Revision: 1989
Modified:
trunk/src/main/org/jboss/jms/client/ClientAOPStackLoader.java
trunk/src/main/org/jboss/jms/client/FailoverCommandCenter.java
trunk/src/main/org/jboss/jms/client/plugin/LoadBalancingFactory.java
trunk/src/main/org/jboss/jms/client/plugin/RoundRobinLoadBalancingFactory.java
trunk/src/main/org/jboss/jms/client/plugin/RoundRobinLoadBalancingPolicy.java
trunk/src/main/org/jboss/jms/client/remoting/CallbackHandler.java
trunk/src/main/org/jboss/jms/delegate/ConnectionFactoryDelegate.java
trunk/src/main/org/jboss/jms/server/ConnectionManager.java
trunk/src/main/org/jboss/jms/server/ServerPeer.java
trunk/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java
trunk/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java
trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java
trunk/src/main/org/jboss/jms/server/remoting/JMSServerInvocationHandler.java
trunk/src/main/org/jboss/jms/tx/MessagingXAResource.java
trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java
trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverValveTest.java
trunk/tests/src/org/jboss/test/messaging/tools/jndi/RemoteContext.java
trunk/tests/src/org/jboss/test/messaging/tools/jndi/RemoteInitialContextFactory.java
Log:
minor refactoring, reformatting, removing obsolete import statements, etc.
Modified: trunk/src/main/org/jboss/jms/client/ClientAOPStackLoader.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/ClientAOPStackLoader.java 2007-01-18 21:24:04 UTC (rev 1988)
+++ trunk/src/main/org/jboss/jms/client/ClientAOPStackLoader.java 2007-01-19 03:24:03 UTC (rev 1989)
@@ -19,9 +19,9 @@
*/
public class ClientAOPStackLoader
{
- // Constants -----------------------------------------------------
+ // Constants ------------------------------------------------------------------------------------
- // Static --------------------------------------------------------
+ // Static ---------------------------------------------------------------------------------------
public static ClientAOPStackLoader getInstance()
{
@@ -35,20 +35,20 @@
}
}
- // Attributes ----------------------------------------------------
+ // Attributes -----------------------------------------------------------------------------------
private static ClientAOPStackLoader instance;
private boolean loaded;
- // Constructors --------------------------------------------------
+ // Constructors ---------------------------------------------------------------------------------
private ClientAOPStackLoader()
{
loaded = false;
}
- // Public --------------------------------------------------------
+ // Public ---------------------------------------------------------------------------------------
/**
* @param delegate - either an instance of ClientClusteredConnectionFactoryDelegate or
@@ -71,11 +71,11 @@
loaded = true;
}
- // Package protected ---------------------------------------------
+ // Package protected ----------------------------------------------------------------------------
- // Protected -----------------------------------------------------
+ // Protected ------------------------------------------------------------------------------------
- // Private -------------------------------------------------------
+ // Private --------------------------------------------------------------------------------------
- // Inner classes -------------------------------------------------
+ // Inner classes --------------------------------------------------------------------------------
}
Modified: trunk/src/main/org/jboss/jms/client/FailoverCommandCenter.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/FailoverCommandCenter.java 2007-01-18 21:24:04 UTC (rev 1988)
+++ trunk/src/main/org/jboss/jms/client/FailoverCommandCenter.java 2007-01-19 03:24:03 UTC (rev 1989)
@@ -116,9 +116,8 @@
}
finally
{
- // I have this secondary try..finally block,
- // just because if broadcastFailoverEvent throws any exceptions
- // I don't want a dead lock on everybody waiting the valve to be opened.
+ // I have this secondary try/finally block, just because if broadcastFailoverEvent throws
+ // any exceptions I don't want a dead lock on everybody waiting the valve to be opened.
try
{
if (failoverSuccessful)
Modified: trunk/src/main/org/jboss/jms/client/plugin/LoadBalancingFactory.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/plugin/LoadBalancingFactory.java 2007-01-18 21:24:04 UTC (rev 1988)
+++ trunk/src/main/org/jboss/jms/client/plugin/LoadBalancingFactory.java 2007-01-19 03:24:03 UTC (rev 1989)
@@ -28,7 +28,7 @@
/**
* @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
* @version <tt>$Revision$</tt>
- * $Id$
+ * $Id$
*/
public abstract class LoadBalancingFactory implements Serializable
{
@@ -48,7 +48,7 @@
// Public ---------------------------------------------------------------------------------------
/**
- * A LoadBalancingPolicy will work on top of ConnectionFactoryDelegate
+ * A LoadBalancingPolicy will work on top of ConnectionFactoryDelegate.
*/
public abstract LoadBalancingPolicy createLoadBalancingPolicy(ConnectionFactoryDelegate[] view);
@@ -57,7 +57,6 @@
return theInstance;
}
-
// Package protected ----------------------------------------------------------------------------
// Protected ------------------------------------------------------------------------------------
Modified: trunk/src/main/org/jboss/jms/client/plugin/RoundRobinLoadBalancingFactory.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/plugin/RoundRobinLoadBalancingFactory.java 2007-01-18 21:24:04 UTC (rev 1988)
+++ trunk/src/main/org/jboss/jms/client/plugin/RoundRobinLoadBalancingFactory.java 2007-01-19 03:24:03 UTC (rev 1989)
@@ -27,8 +27,7 @@
/**
* @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
* @version <tt>$Revision$</tt>
- * <p/>
- * $Id$
+ * $Id$
*/
public class RoundRobinLoadBalancingFactory extends LoadBalancingFactory
{
Modified: trunk/src/main/org/jboss/jms/client/plugin/RoundRobinLoadBalancingPolicy.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/plugin/RoundRobinLoadBalancingPolicy.java 2007-01-18 21:24:04 UTC (rev 1988)
+++ trunk/src/main/org/jboss/jms/client/plugin/RoundRobinLoadBalancingPolicy.java 2007-01-19 03:24:03 UTC (rev 1989)
@@ -8,9 +8,6 @@
import org.jboss.jms.delegate.ConnectionFactoryDelegate;
-import java.util.List;
-import java.util.ArrayList;
-
/**
* @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
* @version <tt>$Revision$</tt>
Modified: trunk/src/main/org/jboss/jms/client/remoting/CallbackHandler.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/remoting/CallbackHandler.java 2007-01-18 21:24:04 UTC (rev 1988)
+++ trunk/src/main/org/jboss/jms/client/remoting/CallbackHandler.java 2007-01-19 03:24:03 UTC (rev 1989)
@@ -22,13 +22,11 @@
package org.jboss.jms.client.remoting;
-import org.jboss.jms.message.MessageProxy;
-
/**
* @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
* @version <tt>$Revision$</tt>
*
- * $Id$
+ * $Id$
*/
public interface CallbackHandler
{
Modified: trunk/src/main/org/jboss/jms/delegate/ConnectionFactoryDelegate.java
===================================================================
--- trunk/src/main/org/jboss/jms/delegate/ConnectionFactoryDelegate.java 2007-01-18 21:24:04 UTC (rev 1988)
+++ trunk/src/main/org/jboss/jms/delegate/ConnectionFactoryDelegate.java 2007-01-19 03:24:03 UTC (rev 1989)
@@ -24,10 +24,8 @@
import org.jboss.jms.server.endpoint.ConnectionFactoryEndpoint;
/**
- * Represents the minimal set of operations to provide connection factory
- * functionality.
- * Some of the methods may be implemented on the server, others
- * will be handled in the advice stack.
+ * Represents the minimal set of operations to provide connection factory functionality. Some of the
+ * methods may be implemented on the server, others will be handled in the advice stack.
*
* @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
Modified: trunk/src/main/org/jboss/jms/server/ConnectionManager.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/ConnectionManager.java 2007-01-18 21:24:04 UTC (rev 1988)
+++ trunk/src/main/org/jboss/jms/server/ConnectionManager.java 2007-01-19 03:24:03 UTC (rev 1989)
@@ -35,7 +35,9 @@
*/
public interface ConnectionManager extends MessagingComponent
{
- void registerConnection(String jmsClientVMId, String remotingClientSessionID, ConnectionEndpoint endpoint);
+ void registerConnection(String jmsClientVMId,
+ String remotingClientSessionID,
+ ConnectionEndpoint endpoint);
/**
* @return null if there is no such connection.
@@ -48,8 +50,7 @@
/**
* Returns a list of active connections on this Manager.
- * The implementation should make a copy of the list to avoid ConcurrentModificationException
- * @return
+ * The implementation should make a copy of the list to avoid ConcurrentModificationException.
*/
List getActiveConnectionsList();
}
Modified: trunk/src/main/org/jboss/jms/server/ServerPeer.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/ServerPeer.java 2007-01-18 21:24:04 UTC (rev 1988)
+++ trunk/src/main/org/jboss/jms/server/ServerPeer.java 2007-01-19 03:24:03 UTC (rev 1989)
@@ -89,8 +89,7 @@
*
* $Id$
*/
-public class ServerPeer extends ServiceMBeanSupport
- implements ServerPeerMBean
+public class ServerPeer extends ServiceMBeanSupport implements ServerPeerMBean
{
// Constants ------------------------------------------------------------------------------------
Modified: trunk/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java 2007-01-18 21:24:04 UTC (rev 1988)
+++ trunk/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java 2007-01-19 03:24:03 UTC (rev 1989)
@@ -37,16 +37,14 @@
import javax.naming.NamingException;
import org.jboss.jms.client.JBossConnectionFactory;
-import org.jboss.jms.client.plugin.LoadBalancingPolicy;
import org.jboss.jms.client.plugin.LoadBalancingFactory;
+import org.jboss.jms.client.plugin.LoadBalancingPolicy;
import org.jboss.jms.client.delegate.ClientConnectionFactoryDelegate;
import org.jboss.jms.client.delegate.ClientClusteredConnectionFactoryDelegate;
import org.jboss.jms.server.ConnectionFactoryManager;
import org.jboss.jms.server.ServerPeer;
import org.jboss.jms.server.Version;
import org.jboss.jms.server.endpoint.ServerConnectionFactoryEndpoint;
-import org.jboss.jms.server.endpoint.ServerConnectionEndpoint;
-import org.jboss.jms.server.endpoint.ConnectionFactoryUpdateMessage;
import org.jboss.jms.server.endpoint.advised.ConnectionFactoryAdvised;
import org.jboss.jms.server.remoting.JMSDispatcher;
import org.jboss.jms.util.JNDIUtil;
@@ -56,7 +54,6 @@
import org.jboss.messaging.core.plugin.contract.Replicator;
import org.jboss.messaging.core.plugin.contract.FailoverMapper;
import org.jboss.messaging.core.plugin.postoffice.cluster.DefaultClusteredPostOffice;
-import org.jboss.remoting.callback.Callback;
/**
* @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
@@ -69,16 +66,18 @@
public class ConnectionFactoryJNDIMapper
implements ConnectionFactoryManager, ReplicationListener
{
- // Constants -----------------------------------------------------
+ // Constants ------------------------------------------------------------------------------------
private static final Logger log = Logger.getLogger(ConnectionFactoryJNDIMapper.class);
- // Static --------------------------------------------------------
-
private static final String CF_PREFIX = "CF_";
- // Attributes ----------------------------------------------------
+ // Static ---------------------------------------------------------------------------------------
+ private static boolean trace = log.isTraceEnabled();
+
+ // Attributes -----------------------------------------------------------------------------------
+
protected Context initialContext;
protected ServerPeer serverPeer;
@@ -95,7 +94,7 @@
// a new ConnectionFactories are deployed we use the cached map.
protected Map failoverMap;
- // Constructors --------------------------------------------------
+ // Constructors ---------------------------------------------------------------------------------
public ConnectionFactoryJNDIMapper(ServerPeer serverPeer) throws Exception
{
@@ -104,7 +103,7 @@
delegates = new HashMap();
}
- // ConnectionFactoryManager implementation -----------------------
+ // ConnectionFactoryManager implementation ------------------------------------------------------
/**
* @param loadBalancingFactory - ignored for non-clustered connection factories.
@@ -221,8 +220,7 @@
}
}
- log.trace("Removing delegate from delegates list with key=" + uniqueName + " at serverPeerID=" +
- this.serverPeer.getServerPeerID());
+ if (trace) { log.trace("Removing delegate from delegates list with key=" + uniqueName + " at serverPeerID=" + this.serverPeer.getServerPeerID()); }
ConnectionFactoryDelegate delegate = (ConnectionFactoryDelegate)delegates.remove(uniqueName);
@@ -241,7 +239,8 @@
//There may be no clustered post office deployed
if (!replicator.remove(CF_PREFIX + uniqueName))
{
- throw new IllegalStateException("Cannot find replicant to remove: " + CF_PREFIX + uniqueName);
+ throw new IllegalStateException("Cannot find replicant to remove: " +
+ CF_PREFIX + uniqueName);
}
}
@@ -250,7 +249,7 @@
JMSDispatcher.instance.unregisterTarget(new Integer(endpoint.getID()));
}
- // MessagingComponent implementation -----------------------------
+ // MessagingComponent implementation ------------------------------------------------------------
public void start() throws Exception
{
@@ -271,7 +270,7 @@
log.debug("stopped");
}
- // ReplicationListener interface ----------------------------------
+ // ReplicationListener interface ----------------------------------------------------------------
/**
* @param updatedReplicantMap Map<Integer(nodeID)-Map<>>
@@ -366,7 +365,7 @@
}
}
- // Public --------------------------------------------------------
+ // Public ---------------------------------------------------------------------------------------
public void injectReplicator(Replicator replicator)
{
@@ -379,11 +378,11 @@
return "Server[" + serverPeer.getServerPeerID() + "].ConnFactoryJNDIMapper";
}
- // Package protected ---------------------------------------------
+ // Package protected ----------------------------------------------------------------------------
- // Protected -----------------------------------------------------
+ // Protected ------------------------------------------------------------------------------------
- // Private -------------------------------------------------------
+ // Private --------------------------------------------------------------------------------------
private void setupReplicator() throws Exception
{
@@ -430,10 +429,8 @@
failoverMap = recalculateFailoverMap(nodeAddressMap.keySet());
}
- return new ClientClusteredConnectionFactoryDelegate(delegates,
- failoverMap,
- loadBalancingFactory.
- createLoadBalancingPolicy(delegates));
+ LoadBalancingPolicy lbp = loadBalancingFactory.createLoadBalancingPolicy(delegates);
+ return new ClientClusteredConnectionFactoryDelegate(delegates, failoverMap, lbp);
}
private void rebindConnectionFactory(Context ic, JNDIBindings jndiBindings,
@@ -472,5 +469,5 @@
return localDels;
}
- // Inner classes -------------------------------------------------
+ // Inner classes --------------------------------------------------------------------------------
}
Modified: trunk/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java 2007-01-18 21:24:04 UTC (rev 1988)
+++ trunk/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java 2007-01-19 03:24:03 UTC (rev 1989)
@@ -49,13 +49,13 @@
*/
public class SimpleConnectionManager implements ConnectionManager, ConnectionListener
{
- // Constants -----------------------------------------------------
+ // Constants ------------------------------------------------------------------------------------
private static final Logger log = Logger.getLogger(SimpleConnectionManager.class);
- // Static --------------------------------------------------------
+ // Static ---------------------------------------------------------------------------------------
- // Attributes ----------------------------------------------------
+ // Attributes -----------------------------------------------------------------------------------
protected Map jmsClients;
@@ -63,7 +63,7 @@
protected Set activeConnections;
- // Constructors --------------------------------------------------
+ // Constructors ---------------------------------------------------------------------------------
public SimpleConnectionManager()
{
@@ -74,9 +74,11 @@
activeConnections = new HashSet();
}
- // ConnectionManager ---------------------------------------------
+ // ConnectionManager ----------------------------------------------------------------------------
- public synchronized void registerConnection(String jmsClientVMId, String remotingClientSessionID, ConnectionEndpoint endpoint)
+ public synchronized void registerConnection(String jmsClientVMId,
+ String remotingClientSessionID,
+ ConnectionEndpoint endpoint)
{
Map endpoints = (Map)jmsClients.get(jmsClientVMId);
@@ -96,7 +98,8 @@
Util.guidToString(remotingClientSessionID));
}
- public synchronized ConnectionEndpoint unregisterConnection(String jmsClientVMId, String remotingClientSessionID)
+ public synchronized ConnectionEndpoint unregisterConnection(String jmsClientVMId,
+ String remotingClientSessionID)
{
Map endpoints = (Map)jmsClients.get(jmsClientVMId);
@@ -204,7 +207,7 @@
return Collections.unmodifiableMap(jmsClients);
}
- // ConnectionListener --------------------------------------------
+ // ConnectionListener ---------------------------------------------------------------------------
/**
* Be aware that ConnectionNotifier uses to call this method with null Throwables.
@@ -230,7 +233,7 @@
}
}
- // MessagingComponent implementation --------------------------------
+ // MessagingComponent implementation ------------------------------------------------------------
public void start() throws Exception
{
@@ -242,19 +245,19 @@
//NOOP
}
- // Public --------------------------------------------------------
+ // Public ---------------------------------------------------------------------------------------
public String toString()
{
return "ConnectionManager[" + Integer.toHexString(hashCode()) + "]";
}
- // Package protected ---------------------------------------------
+ // Package protected ----------------------------------------------------------------------------
- // Protected -----------------------------------------------------
+ // Protected ------------------------------------------------------------------------------------
- // Private -------------------------------------------------------
+ // Private --------------------------------------------------------------------------------------
- // Inner classes -------------------------------------------------
+ // Inner classes --------------------------------------------------------------------------------
}
Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java 2007-01-18 21:24:04 UTC (rev 1988)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java 2007-01-19 03:24:03 UTC (rev 1989)
@@ -33,8 +33,6 @@
import org.jboss.logging.Logger;
import org.jboss.messaging.core.plugin.IDBlock;
import org.jboss.remoting.callback.Callback;
-import EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock;
-import EDU.oswego.cs.dl.util.concurrent.ReadWriteLock;
import java.util.List;
import java.util.Map;
import java.util.Iterator;
Modified: trunk/src/main/org/jboss/jms/server/remoting/JMSServerInvocationHandler.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/remoting/JMSServerInvocationHandler.java 2007-01-18 21:24:04 UTC (rev 1988)
+++ trunk/src/main/org/jboss/jms/server/remoting/JMSServerInvocationHandler.java 2007-01-19 03:24:03 UTC (rev 1989)
@@ -28,7 +28,6 @@
import javax.management.MBeanServer;
-import org.jboss.aop.Dispatcher;
import org.jboss.aop.joinpoint.InvocationResponse;
import org.jboss.aop.joinpoint.MethodInvocation;
import org.jboss.aop.util.PayloadKey;
Modified: trunk/src/main/org/jboss/jms/tx/MessagingXAResource.java
===================================================================
--- trunk/src/main/org/jboss/jms/tx/MessagingXAResource.java 2007-01-18 21:24:04 UTC (rev 1988)
+++ trunk/src/main/org/jboss/jms/tx/MessagingXAResource.java 2007-01-19 03:24:03 UTC (rev 1989)
@@ -52,11 +52,11 @@
*/
public class MessagingXAResource implements XAResource
{
- // Constants -----------------------------------------------------
+ // Constants ------------------------------------------------------------------------------------
private static final Logger log = Logger.getLogger(MessagingXAResource.class);
- // Attributes ----------------------------------------------------
+ // Attributes -----------------------------------------------------------------------------------
private boolean trace = log.isTraceEnabled();
@@ -69,9 +69,9 @@
//For testing only
private boolean preventJoining;
- // Static --------------------------------------------------------
+ // Static ---------------------------------------------------------------------------------------
- // Constructors --------------------------------------------------
+ // Constructors ---------------------------------------------------------------------------------
public MessagingXAResource(ResourceManager rm, SessionState sessionState)
{
@@ -82,7 +82,7 @@
this.connection = (ConnectionDelegate)(sessionState.getParent()).getDelegate();
}
- // XAResource implementation -------------------------------------
+ // XAResource implementation --------------------------------------------------------------------
public boolean setTransactionTimeout(int timeout) throws XAException
{
@@ -251,7 +251,7 @@
}
}
- // Public --------------------------------------------------------
+ // Public ---------------------------------------------------------------------------------------
public String toString()
{
@@ -269,11 +269,11 @@
this.preventJoining = preventJoining;
}
- // Package protected ---------------------------------------------
+ // Package protected ----------------------------------------------------------------------------
- // Protected -----------------------------------------------------
+ // Protected ------------------------------------------------------------------------------------
- // Private -------------------------------------------------------
+ // Private --------------------------------------------------------------------------------------
private void setCurrentTransactionId(final Xid xid)
{
@@ -299,5 +299,5 @@
}
}
- // Inner classes -------------------------------------------------
+ // Inner classes --------------------------------------------------------------------------------
}
\ No newline at end of file
Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java 2007-01-18 21:24:04 UTC (rev 1988)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java 2007-01-19 03:24:03 UTC (rev 1989)
@@ -1605,13 +1605,87 @@
}
}
+ public void testSimpleFailoverWithRemotingListenerEnabled() throws Exception
+ {
+ Connection conn = null;
+
+ try
+ {
+ conn = cf.createConnection();
+ conn.close();
+
+ conn = cf.createConnection();
+ conn.start();
+
+ // make sure we're connecting to node 1
+
+ int nodeID = ((ConnectionState)((DelegateSupport)((JBossConnection)conn).
+ getDelegate()).getState()).getServerID();
+
+ assertEquals(1, nodeID);
+
+ Session s1 = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ MessageConsumer c1 = s1.createConsumer(queue[1]);
+ MessageProducer p1 = s1.createProducer(queue[1]);
+ p1.setDeliveryMode(DeliveryMode.PERSISTENT);
+
+ // send a message
+
+ p1.send(s1.createTextMessage("blip"));
+
+ // kill node 1
+
+ ServerManagement.killAndWait(1);
+ log.info("########");
+ log.info("######## KILLED NODE 1");
+ log.info("########");
+
+ try
+ {
+ ic[1].lookup("queue"); // looking up anything
+ fail("The server still alive, kill didn't work yet");
+ }
+ catch (Exception e)
+ {
+ }
+
+ // we must receive the message
+
+ TextMessage tm = (TextMessage)c1.receive(1000);
+ assertEquals("blip", tm.getText());
+
+ }
+ finally
+ {
+ if (conn != null)
+ {
+ conn.close();
+ }
+ }
+ }
+
// Package protected ----------------------------------------------------------------------------
// Protected ------------------------------------------------------------------------------------
- protected void simpleFailover(String userName, String password)
- throws Exception
+ protected void setUp() throws Exception
{
+ nodeCount = 2;
+
+ super.setUp();
+
+ log.debug("setup done");
+ }
+
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ }
+
+ // Private --------------------------------------------------------------------------------------
+
+ private void simpleFailover(String userName, String password) throws Exception
+ {
Connection conn = null;
try
@@ -1686,26 +1760,6 @@
}
}
- // Package protected ----------------------------------------------------------------------------
-
- // Protected ------------------------------------------------------------------------------------
-
- protected void setUp() throws Exception
- {
- nodeCount = 2;
-
- super.setUp();
-
- log.debug("setup done");
- }
-
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
- // Private --------------------------------------------------------------------------------------
-
// Inner classes --------------------------------------------------------------------------------
private class SimpleFailoverListener implements FailoverListener
Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverValveTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverValveTest.java 2007-01-18 21:24:04 UTC (rev 1988)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverValveTest.java 2007-01-19 03:24:03 UTC (rev 1989)
@@ -23,7 +23,6 @@
package org.jboss.test.messaging.jms.clustering;
import org.jboss.jms.client.FailoverValve;
-import org.jboss.logging.Logger;
import org.jboss.test.messaging.MessagingTestCase;
@@ -36,10 +35,7 @@
*/
public class FailoverValveTest extends MessagingTestCase
{
-
-
// Constants ------------------------------------------------------------------------------------
- private static final Logger log = Logger.getLogger(FailoverValveTest.class);
// Attributes -----------------------------------------------------------------------------------
Modified: trunk/tests/src/org/jboss/test/messaging/tools/jndi/RemoteContext.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jndi/RemoteContext.java 2007-01-18 21:24:04 UTC (rev 1988)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jndi/RemoteContext.java 2007-01-19 03:24:03 UTC (rev 1989)
@@ -72,8 +72,6 @@
{
try
{
- log.info(this + " lookup: " + name);
-
return namingDelegate.lookup(name);
}
catch(Exception e)
Modified: trunk/tests/src/org/jboss/test/messaging/tools/jndi/RemoteInitialContextFactory.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jndi/RemoteInitialContextFactory.java 2007-01-18 21:24:04 UTC (rev 1988)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jndi/RemoteInitialContextFactory.java 2007-01-19 03:24:03 UTC (rev 1989)
@@ -63,7 +63,7 @@
public Context getInitialContext(Hashtable environment) throws NamingException
{
- log.info(this + " getting intialcontext for " + environment);
+ log.info(this + " getting intial context for " + environment);
String s = (String)environment.get(Constants.SERVER_INDEX_PROPERTY_NAME);
More information about the jboss-cvs-commits
mailing list