[hornetq-commits] JBoss hornetq SVN: r8123 - in trunk: src/main/org/hornetq/core/client/impl and 7 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Sat Oct 17 07:57:49 EDT 2009
Author: timfox
Date: 2009-10-17 07:57:49 -0400 (Sat, 17 Oct 2009)
New Revision: 8123
Modified:
trunk/docs/user-manual/en/client-reconnection.xml
trunk/src/main/org/hornetq/core/client/impl/ClientSessionInternal.java
trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java
trunk/src/main/org/hornetq/core/remoting/Interceptor.java
trunk/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java
trunk/src/main/org/hornetq/core/server/impl/RoutingContextImpl.java
trunk/tests/src/org/hornetq/tests/integration/client/NewDeadLetterAddressTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/NettyAsynchronousFailoverTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/client/MessageTest.java
Log:
a few tweaks
Modified: trunk/docs/user-manual/en/client-reconnection.xml
===================================================================
--- trunk/docs/user-manual/en/client-reconnection.xml 2009-10-17 11:46:23 UTC (rev 8122)
+++ trunk/docs/user-manual/en/client-reconnection.xml 2009-10-17 11:57:49 UTC (rev 8123)
@@ -80,9 +80,6 @@
shutting down. A value of <literal>-1</literal> signifies an unlimited number of
attempts. The default value is <literal>-1</literal>.</para>
</listitem>
- <listitem>
- <para><literal>use-reattach</literal>. </para>
- </listitem>
</itemizedlist>
<para>If you're using JMS, and you're using the JMS Service on the server to load your JMS
connection factory instances directly into JNDI, then you can specify these parameters in
Modified: trunk/src/main/org/hornetq/core/client/impl/ClientSessionInternal.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/ClientSessionInternal.java 2009-10-17 11:46:23 UTC (rev 8122)
+++ trunk/src/main/org/hornetq/core/client/impl/ClientSessionInternal.java 2009-10-17 11:57:49 UTC (rev 8123)
@@ -19,6 +19,7 @@
import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage;
import org.hornetq.core.remoting.impl.wireformat.SessionReceiveMessage;
import org.hornetq.core.remoting.spi.HornetQBuffer;
+import org.hornetq.utils.SimpleString;
/**
* A ClientSessionInternal
@@ -55,8 +56,6 @@
void handleFailover(RemotingConnection backupConnection);
- // boolean handleReattach(RemotingConnection backupConnection);
-
RemotingConnection getConnection();
void cleanUp() throws Exception;
@@ -70,4 +69,6 @@
void workDone();
void forceDelivery(long consumerID, long sequence) throws HornetQException;
+
+ //void sendProducerCreditsMessage(int credits, SimpleString destination);
}
Modified: trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java 2009-10-17 11:46:23 UTC (rev 8122)
+++ trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java 2009-10-17 11:57:49 UTC (rev 8123)
@@ -931,13 +931,13 @@
{
public void run()
{
- deliverReferences(refs);
+ addReferences(refs);
}
});
}
else
{
- deliverReferences(refs);
+ addReferences(refs);
}
}
}
@@ -945,11 +945,10 @@
/**
* @param refs
*/
- private void deliverReferences(final List<MessageReference> refs)
+ private void addReferences(final List<MessageReference> refs)
{
for (MessageReference ref : refs)
- {
-
+ {
ref.getQueue().addLast(ref);
}
}
Modified: trunk/src/main/org/hornetq/core/remoting/Interceptor.java
===================================================================
--- trunk/src/main/org/hornetq/core/remoting/Interceptor.java 2009-10-17 11:46:23 UTC (rev 8122)
+++ trunk/src/main/org/hornetq/core/remoting/Interceptor.java 2009-10-17 11:57:49 UTC (rev 8123)
@@ -22,7 +22,7 @@
* To Add this interceptor, you have to modify hornetq-configuration.xml
*
* @author clebert.suconic at jboss.com
- * @author tim.fox at jboss.com
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
*/
public interface Interceptor
{
Modified: trunk/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java 2009-10-17 11:46:23 UTC (rev 8122)
+++ trunk/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java 2009-10-17 11:57:49 UTC (rev 8123)
@@ -468,8 +468,7 @@
ReplicationContext tokenPolled = pendingTokens.poll();
if (tokenPolled == null)
{
- // We should debug the logs if this happens
- log.warn("Missing replication token on the stack. There is a bug on the ReplicatoinManager since this was not supposed to happen");
+ throw new IllegalStateException("Missing replication token on the queue.");
}
else
{
Modified: trunk/src/main/org/hornetq/core/server/impl/RoutingContextImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/RoutingContextImpl.java 2009-10-17 11:46:23 UTC (rev 8122)
+++ trunk/src/main/org/hornetq/core/server/impl/RoutingContextImpl.java 2009-10-17 11:57:49 UTC (rev 8123)
@@ -23,7 +23,7 @@
/**
* A RoutingContextImpl
*
- * @author tim
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
*
*
*/
Modified: trunk/tests/src/org/hornetq/tests/integration/client/NewDeadLetterAddressTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/NewDeadLetterAddressTest.java 2009-10-17 11:46:23 UTC (rev 8122)
+++ trunk/tests/src/org/hornetq/tests/integration/client/NewDeadLetterAddressTest.java 2009-10-17 11:57:49 UTC (rev 8123)
@@ -12,14 +12,6 @@
*/
package org.hornetq.tests.integration.client;
-import static org.hornetq.tests.util.RandomUtil.randomSimpleString;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.transaction.xa.XAResource;
-import javax.transaction.xa.Xid;
-
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -29,12 +21,9 @@
import org.hornetq.core.config.TransportConfiguration;
import org.hornetq.core.config.impl.ConfigurationImpl;
import org.hornetq.core.exception.HornetQException;
-import org.hornetq.core.message.impl.MessageImpl;
import org.hornetq.core.server.HornetQ;
import org.hornetq.core.server.HornetQServer;
-import org.hornetq.core.server.Queue;
import org.hornetq.core.settings.impl.AddressSettings;
-import org.hornetq.core.transaction.impl.XidImpl;
import org.hornetq.tests.util.UnitTestCase;
import org.hornetq.utils.SimpleString;
@@ -42,7 +31,7 @@
*
* A NewDeadLetterAddressTest
*
- * @author tim fox
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
*
*
*/
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2009-10-17 11:46:23 UTC (rev 8122)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2009-10-17 11:57:49 UTC (rev 8123)
@@ -30,7 +30,7 @@
/**
* A FailoverTestBase
*
- * @author tim
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
*
*
*/
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/NettyAsynchronousFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/NettyAsynchronousFailoverTest.java 2009-10-17 11:46:23 UTC (rev 8122)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/NettyAsynchronousFailoverTest.java 2009-10-17 11:57:49 UTC (rev 8123)
@@ -13,16 +13,12 @@
package org.hornetq.tests.integration.cluster.failover;
-import java.util.HashMap;
-import java.util.Map;
-
import org.hornetq.core.config.TransportConfiguration;
-import org.hornetq.integration.transports.netty.TransportConstants;
/**
* A NettyAsynchronousFailoverTest
*
- * @author tim
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
*
*
*/
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/MessageTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/client/MessageTest.java 2009-10-17 11:46:23 UTC (rev 8122)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/client/MessageTest.java 2009-10-17 11:57:49 UTC (rev 8123)
@@ -27,7 +27,7 @@
*
* A MessageTest
*
- * @author tim
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
*
*
*/
More information about the hornetq-commits
mailing list