[hornetq-commits] JBoss hornetq SVN: r9528 - in branches/2_2_0_HA_Improvements/src/main/org/hornetq/core: protocol/core/impl and 3 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Wed Aug 11 08:27:29 EDT 2010
Author: jmesnil
Date: 2010-08-11 08:27:29 -0400 (Wed, 11 Aug 2010)
New Revision: 9528
Removed:
branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java
Modified:
branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java
branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/CoreProtocolManager.java
branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/PacketDecoder.java
branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/PacketImpl.java
branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/ClusterManager.java
branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java
Log:
removed dead code
Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java 2010-08-11 09:15:56 UTC (rev 9527)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java 2010-08-11 12:27:29 UTC (rev 9528)
@@ -44,7 +44,6 @@
import org.hornetq.core.cluster.DiscoveryListener;
import org.hornetq.core.cluster.impl.DiscoveryGroupImpl;
import org.hornetq.core.logging.Logger;
-import org.hornetq.core.protocol.core.impl.wireformat.NodeAnnounceMessage;
import org.hornetq.utils.HornetQThreadFactory;
import org.hornetq.utils.UUIDGenerator;
@@ -439,11 +438,6 @@
try
{
sf = createSessionFactory(connector);
- if (sf != null)
- {
- ClientSessionFactoryInternal internalSF = (ClientSessionFactoryInternal)sf;
- internalSF.getConnection().getChannel(0, -1).send(new NodeAnnounceMessage(nodeID, backup, transportConfig));
- }
}
catch (HornetQException e)
{
Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/CoreProtocolManager.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/CoreProtocolManager.java 2010-08-11 09:15:56 UTC (rev 9527)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/CoreProtocolManager.java 2010-08-11 12:27:29 UTC (rev 9528)
@@ -30,7 +30,6 @@
import org.hornetq.core.protocol.core.Packet;
import org.hornetq.core.protocol.core.ServerSessionPacketHandler;
import org.hornetq.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage;
-import org.hornetq.core.protocol.core.impl.wireformat.NodeAnnounceMessage;
import org.hornetq.core.protocol.core.impl.wireformat.Ping;
import org.hornetq.core.protocol.core.impl.wireformat.SubscribeClusterTopologyUpdatesMessage;
import org.hornetq.core.remoting.CloseListener;
@@ -138,22 +137,6 @@
}
});
}
- else if (packet.getType() == PacketImpl.NODE_ANNOUNCE)
- {
- NodeAnnounceMessage msg = (NodeAnnounceMessage)packet;
- TransportConfiguration connector = msg.getConnector();
- boolean backup = msg.isBackup();
- Pair<TransportConfiguration, TransportConfiguration> pair;
- if (backup)
- {
- pair = new Pair<TransportConfiguration, TransportConfiguration>(null, connector);
- }
- else
- {
- pair = new Pair<TransportConfiguration, TransportConfiguration>(connector, null);
- }
- server.getClusterManager().announceNode(msg.getNodeID(), pair);
- }
}
});
Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/PacketDecoder.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/PacketDecoder.java 2010-08-11 09:15:56 UTC (rev 9527)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/PacketDecoder.java 2010-08-11 12:27:29 UTC (rev 9528)
@@ -21,7 +21,6 @@
import static org.hornetq.core.protocol.core.impl.PacketImpl.DELETE_QUEUE;
import static org.hornetq.core.protocol.core.impl.PacketImpl.DISCONNECT;
import static org.hornetq.core.protocol.core.impl.PacketImpl.EXCEPTION;
-import static org.hornetq.core.protocol.core.impl.PacketImpl.NODE_ANNOUNCE;
import static org.hornetq.core.protocol.core.impl.PacketImpl.NULL_RESPONSE;
import static org.hornetq.core.protocol.core.impl.PacketImpl.PACKETS_CONFIRMED;
import static org.hornetq.core.protocol.core.impl.PacketImpl.PING;
@@ -91,7 +90,6 @@
import org.hornetq.core.protocol.core.impl.wireformat.CreateSessionMessage;
import org.hornetq.core.protocol.core.impl.wireformat.CreateSessionResponseMessage;
import org.hornetq.core.protocol.core.impl.wireformat.HornetQExceptionMessage;
-import org.hornetq.core.protocol.core.impl.wireformat.NodeAnnounceMessage;
import org.hornetq.core.protocol.core.impl.wireformat.NullResponseMessage;
import org.hornetq.core.protocol.core.impl.wireformat.PacketsConfirmedMessage;
import org.hornetq.core.protocol.core.impl.wireformat.Ping;
@@ -497,11 +495,6 @@
packet = new ClusterTopologyChangeMessage();
break;
}
- case NODE_ANNOUNCE:
- {
- packet = new NodeAnnounceMessage();
- break;
- }
case SUBSCRIBE_TOPOLOGY:
{
packet = new SubscribeClusterTopologyUpdatesMessage();
Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/PacketImpl.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/PacketImpl.java 2010-08-11 09:15:56 UTC (rev 9527)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/PacketImpl.java 2010-08-11 12:27:29 UTC (rev 9528)
@@ -186,8 +186,6 @@
public static final byte CLUSTER_TOPOLOGY = 110;
- public static final byte NODE_ANNOUNCE = 111;
-
public static final byte SUBSCRIBE_TOPOLOGY = 112;
// Static --------------------------------------------------------
Deleted: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java 2010-08-11 09:15:56 UTC (rev 9527)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java 2010-08-11 12:27:29 UTC (rev 9528)
@@ -1,103 +0,0 @@
-/*
- * Copyright 2009 Red Hat, Inc.
- * Red Hat licenses this file to you under the Apache License, version
- * 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package org.hornetq.core.protocol.core.impl.wireformat;
-
-import org.hornetq.api.core.HornetQBuffer;
-import org.hornetq.api.core.TransportConfiguration;
-import org.hornetq.core.logging.Logger;
-import org.hornetq.core.protocol.core.impl.PacketImpl;
-
-/**
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- *
- */
-public class NodeAnnounceMessage extends PacketImpl
-{
- // Constants -----------------------------------------------------
-
- private static final Logger log = Logger.getLogger(NodeAnnounceMessage.class);
-
- // Attributes ----------------------------------------------------
-
- private String nodeID;
-
- private boolean backup;
-
- private TransportConfiguration connector;
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- public NodeAnnounceMessage(final String nodeID, final boolean backup, final TransportConfiguration tc)
- {
- super(PacketImpl.NODE_ANNOUNCE);
-
- this.nodeID = nodeID;
-
- this.backup = backup;
-
- this.connector = tc;
- }
-
- public NodeAnnounceMessage()
- {
- super(PacketImpl.NODE_ANNOUNCE);
- }
-
- // Public --------------------------------------------------------
-
-
- public String getNodeID()
- {
- return nodeID;
- }
-
- public boolean isBackup()
- {
- return backup;
- }
-
- public TransportConfiguration getConnector()
- {
- return connector;
- }
-
-
- @Override
- public void encodeRest(final HornetQBuffer buffer)
- {
- buffer.writeString(nodeID);
- buffer.writeBoolean(backup);
- connector.encode(buffer);
- }
-
- @Override
- public void decodeRest(final HornetQBuffer buffer)
- {
- this.nodeID = buffer.readString();
- this.backup = buffer.readBoolean();
- connector = new TransportConfiguration();
- connector.decode(buffer);
- }
-
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-}
Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/ClusterManager.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/ClusterManager.java 2010-08-11 09:15:56 UTC (rev 9527)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/ClusterManager.java 2010-08-11 12:27:29 UTC (rev 9528)
@@ -49,6 +49,4 @@
void notifyClientsNodeDown(String nodeID);
void notifyClientsNodeUp(String nodeID, Pair<TransportConfiguration, TransportConfiguration> connectorPair, boolean b);
-
- void announceNode(String nodeID, Pair<TransportConfiguration, TransportConfiguration> pair);
}
Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2010-08-11 09:15:56 UTC (rev 9527)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2010-08-11 12:27:29 UTC (rev 9528)
@@ -234,18 +234,6 @@
}
}
- public void announceNode(String nodeID, Pair<TransportConfiguration, TransportConfiguration> pair)
- {
- /*
- System.out.println("node " + server.getNodeID() + " announces " + nodeID + " to its cluster connections " + clusterConnections.keySet());
- for (ClusterConnection clusterConnection : clusterConnections.values())
- {
- clusterConnection.announce(nodeID, pair, false);
- }
- */
-
- }
-
public boolean isStarted()
{
return started;
More information about the hornetq-commits
mailing list