[jboss-cvs] JBoss Messaging SVN: r4900 - in trunk/src/main/org/jboss/messaging/core: remoting/impl/mina and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Sep 1 03:32:48 EDT 2008
Author: timfox
Date: 2008-09-01 03:32:48 -0400 (Mon, 01 Sep 2008)
New Revision: 4900
Modified:
trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMAcceptorFactory.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMConnectorFactory.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnectorFactory.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/NettyConnectorFactory.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java
Log:
A bit of tidying up, and serialversionuids
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMAcceptorFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMAcceptorFactory.java 2008-08-29 21:41:39 UTC (rev 4899)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMAcceptorFactory.java 2008-09-01 07:32:48 UTC (rev 4900)
@@ -23,7 +23,6 @@
import java.util.Map;
-import org.jboss.messaging.core.config.Configuration;
import org.jboss.messaging.core.remoting.RemotingHandler;
import org.jboss.messaging.core.remoting.spi.Acceptor;
import org.jboss.messaging.core.remoting.spi.AcceptorFactory;
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMConnectorFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMConnectorFactory.java 2008-08-29 21:41:39 UTC (rev 4899)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMConnectorFactory.java 2008-09-01 07:32:48 UTC (rev 4900)
@@ -36,6 +36,8 @@
*/
public class InVMConnectorFactory implements ConnectorFactory
{
+ private static final long serialVersionUID = 1398950653661802190L;
+
public Connector createConnector(final Map<String, Object> configuration,
final RemotingHandler handler, final ConnectionLifeCycleListener listener)
{
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnectorFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnectorFactory.java 2008-08-29 21:41:39 UTC (rev 4899)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaConnectorFactory.java 2008-09-01 07:32:48 UTC (rev 4900)
@@ -16,6 +16,8 @@
*/
public class MinaConnectorFactory implements ConnectorFactory
{
+ private static final long serialVersionUID = -1395375418386685767L;
+
public Connector createConnector(final Map<String, Object> configuration,
final RemotingHandler handler, final ConnectionLifeCycleListener listener)
{
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/NettyConnectorFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/NettyConnectorFactory.java 2008-08-29 21:41:39 UTC (rev 4899)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/netty/NettyConnectorFactory.java 2008-09-01 07:32:48 UTC (rev 4900)
@@ -14,6 +14,8 @@
*/
public class NettyConnectorFactory implements ConnectorFactory
{
+ private static final long serialVersionUID = 5230517134523506528L;
+
public Connector createConnector(final Map<String, Object> configuration,
final RemotingHandler handler, final ConnectionLifeCycleListener listener)
{
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java 2008-08-29 21:41:39 UTC (rev 4899)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java 2008-09-01 07:32:48 UTC (rev 4900)
@@ -80,8 +80,6 @@
private final PostOffice postOffice;
- private final boolean replicated = false;
-
// Constructors ---------------------------------------------------------------------------------
public ServerConsumerImpl(final ServerSession session, final long clientTargetID,
@@ -111,29 +109,13 @@
{
availableCredits = null;
}
-
- // this.remotingConnection = remotingConnection;
-
+
this.storageManager = storageManager;
this.queueSettingsRepository = queueSettingsRepository;
this.postOffice = postOffice;
-
-// this.replicated = remotingConnection.isReplicated();
-//
-// if (replicated)
-// {
-// PacketDispatcher replicatingDispatcher =
-// remotingConnection.getReplicatingConnection().getPacketDispatcher();
-// replicatedDeliveryResponseHandler = new ReplicatedDeliveryResponseHandler(replicatingDispatcher.generateID());
-//
-// replicatingDispatcher.register(replicatedDeliveryResponseHandler);
-// }
-
- //Also increment the id on the local one so ids are in step
- // dispatcher.generateID();
-
+
this.id = dispatcher.generateID();
messageQueue.addConsumer(this);
@@ -151,32 +133,6 @@
return clientTargetID;
}
-// public void handleReplicatedDelivery(final long messageID, final long responseTargetID) throws Exception
-// {
-// MessageReference ref = messageQueue.removeFirst();
-//
-// //Sanity check - can remove once stable
-// if (ref.getMessage().getMessageID() != messageID)
-// {
-// throw new IllegalStateException("Message with id " + messageID + " should be at head of queue " +
-// "but instead I found " + ref.getMessage().getMessageID());
-// }
-//
-// HandleStatus handled = handle(ref);
-//
-// //Sanity check
-// if (handled != HandleStatus.HANDLED)
-// {
-// throw new IllegalStateException("Should be handled");
-// }
-//
-// Packet response = new ConsumerReplicateDeliveryResponseMessage(messageID);
-//
-// response.setTargetID(responseTargetID);
-//
-// remotingConnection.sendOneWay(response);
-// }
-
public void handleReplicatedDeliveryResponse(final long messageID) throws Exception
{
session.deliverDeferredDelivery(messageID);
@@ -219,18 +175,6 @@
session.handleDelivery(ref, this);
-// if (replicated)
-// {
-// //Replicate the delivery
-//
-// server Packet packet = new ConsumerReplicateDeliveryMessage(message.getMessageID());
-//
-// packet.setTargetID(this.id);
-// packet.setResponseTargetID(this.replicatedDeliveryResponseHandler.getID());
-//
-// //remotingConnection.replicatePacket(packet);
-// }
-
return HandleStatus.HANDLED;
}
}
@@ -242,14 +186,6 @@
messageQueue.removeConsumer(this);
session.removeConsumer(this);
-
-// if (replicated)
-// {
-// PacketDispatcher replicatingDispatcher =
-// remotingConnection.getReplicatingConnection().getPacketDispatcher();
-//
-// replicatingDispatcher.unregister(replicatedDeliveryResponseHandler.getID());
-// }
}
public void setStarted(final boolean started)
@@ -299,33 +235,4 @@
// Inner classes ------------------------------------------------------------------------
-// private class ReplicatedDeliveryResponseHandler implements PacketHandler
-// {
-// ReplicatedDeliveryResponseHandler(final long id)
-// {
-// this.id = id;
-// }
-//
-// private final long id;
-//
-// public long getID()
-// {
-// return id;
-// }
-//
-// public void handle(final long connectionID, final Packet packet)
-// {
-// try
-// {
-// ConsumerReplicateDeliveryResponseMessage msg = (ConsumerReplicateDeliveryResponseMessage)packet;
-//
-// handleReplicatedDeliveryResponse(msg.getMessageID());
-// }
-// catch (Exception e)
-// {
-// log.error("Failed to handle replicate delivery response", e);
-// }
-// }
-//
-// }
}
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java 2008-08-29 21:41:39 UTC (rev 4899)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java 2008-09-01 07:32:48 UTC (rev 4900)
@@ -140,8 +140,6 @@
private volatile boolean started = false;
- private volatile boolean attached;
-
// Constructors
// ---------------------------------------------------------------------------------
@@ -264,14 +262,7 @@
deliveries.add(delivery);
-// if (!defer)
-// {
- delivery.deliver();
-// }
-// else
-// {
-// //Actual delivery is deferred until the replicate delivery response comes back from the backup
-// }
+ delivery.deliver();
}
public void deliverDeferredDelivery(final long messageID)
More information about the jboss-cvs-commits
mailing list