JBoss hornetq SVN: r9050 - trunk/src/main/org/hornetq/integration/transports/netty.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2010-04-02 06:02:01 -0400 (Fri, 02 Apr 2010)
New Revision: 9050
Modified:
trunk/src/main/org/hornetq/integration/transports/netty/HornetQFrameDecoder2.java
trunk/src/main/org/hornetq/integration/transports/netty/HttpAcceptorHandler.java
trunk/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java
trunk/src/main/org/hornetq/integration/transports/netty/NettyConnection.java
trunk/src/main/org/hornetq/integration/transports/netty/NettyConnector.java
Log:
netty integration
* updated calls to deprecated Netty methods
Modified: trunk/src/main/org/hornetq/integration/transports/netty/HornetQFrameDecoder2.java
===================================================================
--- trunk/src/main/org/hornetq/integration/transports/netty/HornetQFrameDecoder2.java 2010-04-01 22:18:17 UTC (rev 9049)
+++ trunk/src/main/org/hornetq/integration/transports/netty/HornetQFrameDecoder2.java 2010-04-02 10:02:01 UTC (rev 9050)
@@ -18,7 +18,6 @@
import org.jboss.netty.buffer.ChannelBuffers;
import org.jboss.netty.buffer.DynamicChannelBuffer;
import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipelineCoverage;
import org.jboss.netty.channel.Channels;
import org.jboss.netty.channel.MessageEvent;
import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
@@ -30,7 +29,6 @@
*
* @version $Revision: 7839 $, $Date: 2009-08-21 02:26:39 +0900 (2009-08-21, 금) $
*/
-@ChannelPipelineCoverage("one")
public class HornetQFrameDecoder2 extends SimpleChannelUpstreamHandler
{
private ChannelBuffer previousData = ChannelBuffers.EMPTY_BUFFER;
Modified: trunk/src/main/org/hornetq/integration/transports/netty/HttpAcceptorHandler.java
===================================================================
--- trunk/src/main/org/hornetq/integration/transports/netty/HttpAcceptorHandler.java 2010-04-01 22:18:17 UTC (rev 9049)
+++ trunk/src/main/org/hornetq/integration/transports/netty/HttpAcceptorHandler.java 2010-04-02 10:02:01 UTC (rev 9050)
@@ -22,7 +22,6 @@
import org.jboss.netty.buffer.ChannelBuffers;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipelineCoverage;
import org.jboss.netty.channel.ChannelStateEvent;
import org.jboss.netty.channel.Channels;
import org.jboss.netty.channel.MessageEvent;
@@ -40,7 +39,6 @@
* takes care of making sure that every request has a response and also that any uninitiated responses always wait for a response.
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
*/
-@ChannelPipelineCoverage("one")
class HttpAcceptorHandler extends SimpleChannelHandler
{
private final BlockingQueue<ResponseHolder> responses = new LinkedBlockingQueue<ResponseHolder>();
Modified: trunk/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java
===================================================================
--- trunk/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java 2010-04-01 22:18:17 UTC (rev 9049)
+++ trunk/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java 2010-04-02 10:02:01 UTC (rev 9050)
@@ -55,7 +55,6 @@
import org.jboss.netty.channel.ChannelHandler;
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineCoverage;
import org.jboss.netty.channel.ChannelPipelineFactory;
import org.jboss.netty.channel.ChannelStateEvent;
import org.jboss.netty.channel.StaticChannelPipeline;
@@ -563,7 +562,6 @@
// Inner classes -----------------------------------------------------------------------------
- @ChannelPipelineCoverage("one")
private final class HornetQServerChannelHandler extends HornetQChannelHandler
{
HornetQServerChannelHandler(final ChannelGroup group,
@@ -581,7 +579,7 @@
SslHandler sslHandler = ctx.getPipeline().get(SslHandler.class);
if (sslHandler != null)
{
- sslHandler.handshake(e.getChannel()).addListener(new ChannelFutureListener()
+ sslHandler.handshake().addListener(new ChannelFutureListener()
{
public void operationComplete(final ChannelFuture future) throws Exception
{
Modified: trunk/src/main/org/hornetq/integration/transports/netty/NettyConnection.java
===================================================================
--- trunk/src/main/org/hornetq/integration/transports/netty/NettyConnection.java 2010-04-01 22:18:17 UTC (rev 9049)
+++ trunk/src/main/org/hornetq/integration/transports/netty/NettyConnection.java 2010-04-02 10:02:01 UTC (rev 9050)
@@ -85,7 +85,7 @@
{
try
{
- ChannelFuture sslCloseFuture = sslHandler.close(channel);
+ ChannelFuture sslCloseFuture = sslHandler.close();
if (!sslCloseFuture.awaitUninterruptibly(10000))
{
Modified: trunk/src/main/org/hornetq/integration/transports/netty/NettyConnector.java
===================================================================
--- trunk/src/main/org/hornetq/integration/transports/netty/NettyConnector.java 2010-04-01 22:18:17 UTC (rev 9049)
+++ trunk/src/main/org/hornetq/integration/transports/netty/NettyConnector.java 2010-04-02 10:02:01 UTC (rev 9050)
@@ -49,7 +49,6 @@
import org.jboss.netty.channel.ChannelHandler;
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineCoverage;
import org.jboss.netty.channel.ChannelPipelineFactory;
import org.jboss.netty.channel.ChannelStateEvent;
import org.jboss.netty.channel.Channels;
@@ -454,7 +453,7 @@
SslHandler sslHandler = ch.getPipeline().get(SslHandler.class);
if (sslHandler != null)
{
- ChannelFuture handshakeFuture = sslHandler.handshake(ch);
+ ChannelFuture handshakeFuture = sslHandler.handshake();
handshakeFuture.awaitUninterruptibly();
if (handshakeFuture.isSuccess())
{
@@ -498,7 +497,6 @@
// Inner classes -------------------------------------------------
- @ChannelPipelineCoverage("one")
private final class HornetQClientChannelHandler extends HornetQChannelHandler
{
HornetQClientChannelHandler(final ChannelGroup group,
@@ -509,7 +507,6 @@
}
}
- @ChannelPipelineCoverage("one")
class HttpHandler extends SimpleChannelHandler
{
private Channel channel;
14 years, 1 month
JBoss hornetq SVN: r9049 - tags.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2010-04-01 18:18:17 -0400 (Thu, 01 Apr 2010)
New Revision: 9049
Added:
tags/HornetQ_2_1_0_Beta1/
Removed:
tags/HornetQ_2_1_0_Beta1_Pending/
Log:
Renaming Tag of 2.1.0 BETA1
Copied: tags/HornetQ_2_1_0_Beta1 (from rev 9048, tags/HornetQ_2_1_0_Beta1_Pending)
14 years, 1 month
JBoss hornetq SVN: r9048 - tags.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2010-04-01 16:36:26 -0400 (Thu, 01 Apr 2010)
New Revision: 9048
Added:
tags/HornetQ_2_1_0_Beta1_Pending/
Log:
Tag temporary Beta1
Copied: tags/HornetQ_2_1_0_Beta1_Pending (from rev 9047, trunk)
14 years, 1 month
JBoss hornetq SVN: r9047 - trunk/src/main/org/hornetq/ra.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2010-04-01 16:32:37 -0400 (Thu, 01 Apr 2010)
New Revision: 9047
Modified:
trunk/src/main/org/hornetq/ra/HornetQRAConnectionMetaData.java
Log:
Version change
Modified: trunk/src/main/org/hornetq/ra/HornetQRAConnectionMetaData.java
===================================================================
--- trunk/src/main/org/hornetq/ra/HornetQRAConnectionMetaData.java 2010-04-01 20:27:54 UTC (rev 9046)
+++ trunk/src/main/org/hornetq/ra/HornetQRAConnectionMetaData.java 2010-04-01 20:32:37 UTC (rev 9047)
@@ -113,7 +113,7 @@
HornetQRAConnectionMetaData.log.trace("getJMSProviderName()");
}
- return "2.0";
+ return "2.1";
}
/**
@@ -141,7 +141,7 @@
HornetQRAConnectionMetaData.log.trace("getProviderMinorVersion()");
}
- return 0;
+ return 1;
}
/**
14 years, 1 month
JBoss hornetq SVN: r9046 - trunk/docs.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2010-04-01 16:27:54 -0400 (Thu, 01 Apr 2010)
New Revision: 9046
Modified:
trunk/docs/README.html
Log:
Release notes
Modified: trunk/docs/README.html
===================================================================
--- trunk/docs/README.html 2010-04-01 20:05:37 UTC (rev 9045)
+++ trunk/docs/README.html 2010-04-01 20:27:54 UTC (rev 9046)
@@ -3,22 +3,22 @@
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="content-type">
- <title>HornetQ 2.0.0 GA Release Notes</title>
+ <title>HornetQ 2.1.0 BETA1 Release Notes</title>
</head>
<body>
-<h1>Release Notes - HornetQ - Version 2.0.0 GA</h1>
+<h1>Release Notes - HornetQ - Version 2.1.0 BETA1</h1>
<br>
-<h2>13th January 2010</h2>
+<h2>1st April 2010</h2>
-These are the release notes for HornetQ 2.0.0 GA<br><br>
+These are the release notes for HornetQ 2.1.0 BETA1<br><br>
For full description of the contents please see the
-<a href="https://jira.jboss.org/jira/secure/ReleaseNote.jspa?projectId=12310830&st...">HornetQ project JIRA</a>.<br><br>
+<a href="https://jira.jboss.org/jira/secure/ReleaseNote.jspa?version=12313894&styl...">HornetQ project JIRA</a>.<br><br>
-This is a general availability (GA) release for HornetQ 2.0.0<br>
+This release is a feature complete release for forthcoming HornetQ 2.1.0<br>
<br>
14 years, 1 month
JBoss hornetq SVN: r9045 - trunk.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2010-04-01 16:05:37 -0400 (Thu, 01 Apr 2010)
New Revision: 9045
Modified:
trunk/build-maven.xml
Log:
Version change
Modified: trunk/build-maven.xml
===================================================================
--- trunk/build-maven.xml 2010-04-01 20:00:17 UTC (rev 9044)
+++ trunk/build-maven.xml 2010-04-01 20:05:37 UTC (rev 9045)
@@ -13,7 +13,7 @@
-->
<project default="upload" name="HornetQ">
- <property name="hornetq.version" value="2.1.0.r9031"/>
+ <property name="hornetq.version" value="2.1.0.BETA1"/>
<property name="build.dir" value="build"/>
<property name="jars.dir" value="${build.dir}/jars"/>
14 years, 1 month
JBoss hornetq SVN: r9044 - trunk/src/config/common.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2010-04-01 16:00:17 -0400 (Thu, 01 Apr 2010)
New Revision: 9044
Modified:
trunk/src/config/common/hornetq-version.properties
Log:
Change on version
Modified: trunk/src/config/common/hornetq-version.properties
===================================================================
--- trunk/src/config/common/hornetq-version.properties 2010-04-01 16:58:42 UTC (rev 9043)
+++ trunk/src/config/common/hornetq-version.properties 2010-04-01 20:00:17 UTC (rev 9044)
@@ -2,7 +2,7 @@
hornetq.version.majorVersion=2
hornetq.version.minorVersion=1
hornetq.version.microVersion=0
-hornetq.version.incrementingVersion=114
-hornetq.version.versionSuffix=CR1
-hornetq.version.versionTag=CR1
+hornetq.version.incrementingVersion=115
+hornetq.version.versionSuffix=BETA1
+hornetq.version.versionTag=BETA1
hornetq.netty.version=(a)NETTY.VERSION@
14 years, 1 month
JBoss hornetq SVN: r9043 - trunk/src/main/org/hornetq/ra/inflow.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2010-04-01 12:58:42 -0400 (Thu, 01 Apr 2010)
New Revision: 9043
Modified:
trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java
Log:
Reverting using tearDown on the workerThread
Modified: trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java
===================================================================
--- trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java 2010-04-01 14:28:35 UTC (rev 9042)
+++ trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java 2010-04-01 16:58:42 UTC (rev 9043)
@@ -262,14 +262,7 @@
}
deliveryActive.set(false);
- try
- {
- ra.getWorkManager().scheduleWork(new TearDownActivation());
- }
- catch (WorkException e)
- {
- log.warn("exception while scheduling activation teardown " + this, e);
- }
+ teardown();
}
/**
@@ -518,26 +511,4 @@
{
}
}
-
- /**
- * Handles the setup
- */
- private class TearDownActivation implements Work
- {
- public void run()
- {
- try
- {
- teardown();
- }
- catch (Throwable t)
- {
- HornetQActivation.log.error("Unable to tear down activation ", t);
- }
- }
-
- public void release()
- {
- }
- }
}
14 years, 1 month
JBoss hornetq SVN: r9042 - in trunk: src/main/org/hornetq/core/server/impl and 1 other directory.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2010-04-01 10:28:35 -0400 (Thu, 01 Apr 2010)
New Revision: 9042
Modified:
trunk/docs/user-manual/en/scheduled-messages.xml
trunk/src/main/org/hornetq/core/server/impl/ScheduledDeliveryHandlerImpl.java
Log:
fix scheduled message
* do not schedule a message with a negative (or zero) delivery time and treat it as a regular unscheduled message
Modified: trunk/docs/user-manual/en/scheduled-messages.xml
===================================================================
--- trunk/docs/user-manual/en/scheduled-messages.xml 2010-04-01 10:13:11 UTC (rev 9041)
+++ trunk/docs/user-manual/en/scheduled-messages.xml 2010-04-01 14:28:35 UTC (rev 9042)
@@ -26,7 +26,7 @@
<para>The property name used to identify a scheduled message is <literal
>"_HQ_SCHED_DELIVERY"</literal> (or the constant <literal
>Message.HDR_SCHEDULED_DELIVERY_TIME</literal>).</para>
- <para>The specified value must be a <literal>long</literal> corresponding to the time the
+ <para>The specified value must be a positive <literal>long</literal> corresponding to the time the
message must be delivered (in milliseconds). An example of sending a scheduled message
using the JMS API is as follows.</para>
<programlisting>
Modified: trunk/src/main/org/hornetq/core/server/impl/ScheduledDeliveryHandlerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/ScheduledDeliveryHandlerImpl.java 2010-04-01 10:13:11 UTC (rev 9041)
+++ trunk/src/main/org/hornetq/core/server/impl/ScheduledDeliveryHandlerImpl.java 2010-04-01 14:28:35 UTC (rev 9042)
@@ -52,7 +52,7 @@
{
long deliveryTime = ref.getScheduledDeliveryTime();
- if (deliveryTime != 0 && scheduledExecutor != null)
+ if (deliveryTime > 0 && scheduledExecutor != null)
{
if (ScheduledDeliveryHandlerImpl.trace)
{
14 years, 1 month
JBoss hornetq SVN: r9041 - in trunk: src/main/org/hornetq/core/protocol/core/impl and 7 other directories.
by do-not-reply＠jboss.org
Author: timfox
Date: 2010-04-01 06:13:11 -0400 (Thu, 01 Apr 2010)
New Revision: 9041
Modified:
trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java
trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java
trunk/src/main/org/hornetq/core/protocol/core/impl/HornetQPacketHandler.java
trunk/src/main/org/hornetq/core/protocol/core/impl/wireformat/CreateSessionMessage.java
trunk/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java
trunk/src/main/org/hornetq/core/server/HornetQServer.java
trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java
trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java
trunk/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/LargeMessageFailoverTest.java
Log:
fixed default address failover issue
Modified: trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2010-04-01 08:12:35 UTC (rev 9040)
+++ trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2010-04-01 10:13:11 UTC (rev 9041)
@@ -891,7 +891,8 @@
autoCommitSends,
autoCommitAcks,
preAcknowledge,
- confirmationWindowSize);
+ confirmationWindowSize,
+ defaultAddress == null ? null : defaultAddress.toString());
boolean retry = false;
do
{
@@ -995,9 +996,6 @@
}
channel.setTransferring(false);
-
- //Reset default address
- defaultAddress = null;
}
catch (Throwable t)
{
Modified: trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java 2010-04-01 08:12:35 UTC (rev 9040)
+++ trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java 2010-04-01 10:13:11 UTC (rev 9041)
@@ -370,7 +370,8 @@
autoCommitSends,
autoCommitAcks,
preAcknowledge,
- confWindowSize);
+ confWindowSize,
+ null);
Packet pResponse;
try
Modified: trunk/src/main/org/hornetq/core/protocol/core/impl/HornetQPacketHandler.java
===================================================================
--- trunk/src/main/org/hornetq/core/protocol/core/impl/HornetQPacketHandler.java 2010-04-01 08:12:35 UTC (rev 9040)
+++ trunk/src/main/org/hornetq/core/protocol/core/impl/HornetQPacketHandler.java 2010-04-01 10:13:11 UTC (rev 9041)
@@ -164,6 +164,7 @@
request.isAutoCommitAcks(),
request.isPreAcknowledge(),
request.isXA(),
+ request.getDefaultAddress(),
new CoreSessionCallback(request.getName(), protocolManager, channel));
ServerSessionPacketHandler handler = new ServerSessionPacketHandler(session,
Modified: trunk/src/main/org/hornetq/core/protocol/core/impl/wireformat/CreateSessionMessage.java
===================================================================
--- trunk/src/main/org/hornetq/core/protocol/core/impl/wireformat/CreateSessionMessage.java 2010-04-01 08:12:35 UTC (rev 9040)
+++ trunk/src/main/org/hornetq/core/protocol/core/impl/wireformat/CreateSessionMessage.java 2010-04-01 10:13:11 UTC (rev 9041)
@@ -49,6 +49,8 @@
private boolean preAcknowledge;
private int windowSize;
+
+ private String defaultAddress;
// Static --------------------------------------------------------
@@ -64,7 +66,8 @@
final boolean autoCommitSends,
final boolean autoCommitAcks,
final boolean preAcknowledge,
- final int windowSize)
+ final int windowSize,
+ final String defaultAddress)
{
super(PacketImpl.CREATESESSION);
@@ -89,6 +92,8 @@
this.windowSize = windowSize;
this.preAcknowledge = preAcknowledge;
+
+ this.defaultAddress = defaultAddress;
}
public CreateSessionMessage()
@@ -147,6 +152,11 @@
{
return windowSize;
}
+
+ public String getDefaultAddress()
+ {
+ return defaultAddress;
+ }
@Override
public void encodeRest(final HornetQBuffer buffer)
@@ -162,6 +172,7 @@
buffer.writeBoolean(autoCommitAcks);
buffer.writeInt(windowSize);
buffer.writeBoolean(preAcknowledge);
+ buffer.writeNullableString(defaultAddress);
}
@Override
@@ -178,6 +189,7 @@
autoCommitAcks = buffer.readBoolean();
windowSize = buffer.readInt();
preAcknowledge = buffer.readBoolean();
+ defaultAddress = buffer.readNullableString();
}
@Override
@@ -197,7 +209,9 @@
autoCommitSends == r.autoCommitSends &&
autoCommitAcks == r.autoCommitAcks &&
(username == null ? r.username == null : username.equals(r.username)) &&
- (password == null ? r.password == null : password.equals(r.password));
+ (password == null ? r.password == null : password.equals(r.password)) &&
+ (defaultAddress == null ? r.defaultAddress == null : defaultAddress.equals(r.defaultAddress));
+
return matches;
}
Modified: trunk/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java
===================================================================
--- trunk/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java 2010-04-01 08:12:35 UTC (rev 9040)
+++ trunk/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java 2010-04-01 10:13:11 UTC (rev 9041)
@@ -458,6 +458,7 @@
false,
false,
false,
+ null,
stompSession);
stompSession.setServerSession(session);
sessions.put(connection.getID(), stompSession);
@@ -482,6 +483,7 @@
false,
false,
false,
+ null,
stompSession);
stompSession.setServerSession(session);
transactedSessions.put(txID, stompSession);
Modified: trunk/src/main/org/hornetq/core/server/HornetQServer.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/HornetQServer.java 2010-04-01 08:12:35 UTC (rev 9040)
+++ trunk/src/main/org/hornetq/core/server/HornetQServer.java 2010-04-01 10:13:11 UTC (rev 9041)
@@ -89,7 +89,8 @@
boolean autoCommitAcks,
boolean preAcknowledge,
boolean xa,
- final SessionCallback callback) throws Exception;
+ String defaultAddress,
+ SessionCallback callback) throws Exception;
void removeSession(String name) throws Exception;
Modified: trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-04-01 08:12:35 UTC (rev 9040)
+++ trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-04-01 10:13:11 UTC (rev 9041)
@@ -555,6 +555,7 @@
final boolean autoCommitAcks,
final boolean preAcknowledge,
final boolean xa,
+ final String defaultAddress,
final SessionCallback callback) throws Exception
{
@@ -580,6 +581,8 @@
managementService,
this,
configuration.getManagementAddress(),
+ defaultAddress == null ? null :
+ new SimpleString(defaultAddress),
callback);
sessions.put(name, session);
Modified: trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2010-04-01 08:12:35 UTC (rev 9040)
+++ trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2010-04-01 10:13:11 UTC (rev 9041)
@@ -153,6 +153,7 @@
final ManagementService managementService,
final HornetQServer server,
final SimpleString managementAddress,
+ final SimpleString defaultAddress,
final SessionCallback callback) throws Exception
{
this.username = username;
@@ -195,6 +196,8 @@
this.managementAddress = managementAddress;
this.callback = callback;
+
+ this.defaultAddress = defaultAddress;
remotingConnection.addFailureListener(this);
Modified: trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java
===================================================================
--- trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java 2010-04-01 08:12:35 UTC (rev 9040)
+++ trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java 2010-04-01 10:13:11 UTC (rev 9041)
@@ -492,12 +492,6 @@
{
buffer.append(" destination=").append(spec.getDestination());
}
- /*if (session != null)
- {
- buffer.append(" connection=").append(session);
- }*/
- // if (pool != null)
- // buffer.append(" pool=").append(pool.getClass().getName());
buffer.append(" transacted=").append(isDeliveryTransacted);
buffer.append(')');
return buffer.toString();
Modified: trunk/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java 2010-04-01 08:12:35 UTC (rev 9040)
+++ trunk/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java 2010-04-01 10:13:11 UTC (rev 9041)
@@ -91,7 +91,7 @@
protected void tearDown() throws Exception
{
connection.destroy();
-
+
server.stop();
}
@@ -124,7 +124,8 @@
true,
true,
false,
- HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE);
+ HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE,
+ null);
if (compatible)
{
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/LargeMessageFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/LargeMessageFailoverTest.java 2010-04-01 08:12:35 UTC (rev 9040)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/LargeMessageFailoverTest.java 2010-04-01 10:13:11 UTC (rev 9041)
@@ -47,7 +47,7 @@
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------
-
+
/**
* @param name
*/
14 years, 1 month