[hornetq-commits] JBoss hornetq SVN: r9041 - in trunk: src/main/org/hornetq/core/protocol/core/impl and 7 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Apr 1 06:13:12 EDT 2010
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
*/
More information about the hornetq-commits
mailing list