You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2014/02/04 12:52:02 UTC
svn commit: r1564259 - in /qpid/trunk/qpid/java/broker-plugins:
amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
Author: rgodfrey
Date: Tue Feb 4 11:52:02 2014
New Revision: 1564259
URL: http://svn.apache.org/r1564259
Log:
QPID-5504 : remove unused inner classes
Modified:
qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java?rev=1564259&r1=1564258&r2=1564259&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java Tue Feb 4 11:52:02 2014
@@ -856,50 +856,6 @@ public class ServerSession extends Sessi
awaitCommandCompletion();
}
- private class PostEnqueueAction implements ServerTransaction.Action
- {
-
- private final MessageReference<MessageTransferMessage> _reference;
- private final List<? extends BaseQueue> _queues;
- private final boolean _transactional;
-
- public PostEnqueueAction(List<? extends BaseQueue> queues, MessageTransferMessage message, final boolean transactional)
- {
- _reference = message.newReference();
- _transactional = transactional;
- _queues = queues;
- }
-
- public void postCommit()
- {
- for(int i = 0; i < _queues.size(); i++)
- {
- try
- {
- BaseQueue queue = _queues.get(i);
- queue.enqueue(_reference.getMessage(), _transactional, null);
- if(queue instanceof AMQQueue)
- {
- ((AMQQueue)queue).checkCapacity(ServerSession.this);
- }
-
- }
- catch (AMQException e)
- {
- // TODO
- throw new RuntimeException(e);
- }
- }
- _reference.release();
- }
-
- public void onRollback()
- {
- // NO-OP
- _reference.release();
- }
- }
-
public int getUnacknowledgedMessageCount()
{
return _messageDispositionListenerMap.size();
Modified: qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java?rev=1564259&r1=1564258&r2=1564259&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java Tue Feb 4 11:52:02 2014
@@ -1233,68 +1233,7 @@ public class AMQChannel implements AMQSe
return getId().compareTo(o.getId());
}
- private class MessageDeliveryAction implements ServerTransaction.Action
- {
- private final MessageReference<AMQMessage> _reference;
- private List<? extends BaseQueue> _destinationQueues;
-
- public MessageDeliveryAction(AMQMessage currentMessage,
- List<? extends BaseQueue> destinationQueues)
- {
- _reference = currentMessage.newReference();
- _destinationQueues = destinationQueues;
- }
-
- public void postCommit()
- {
- try
- {
- AMQMessage message = _reference.getMessage();
- final boolean immediate = message.isImmediate();
-
- for(int i = 0; i < _destinationQueues.size(); i++)
- {
- BaseQueue queue = _destinationQueues.get(i);
-
- BaseQueue.PostEnqueueAction action;
-
- if(immediate)
- {
- action = new ImmediateAction();
- }
- else
- {
- action = null;
- }
-
- queue.enqueue(message, isTransactional(), action);
- if(queue instanceof AMQQueue)
- {
- ((AMQQueue)queue).checkCapacity(AMQChannel.this);
- }
-
- }
-
- message.getStoredMessage().flushToStore();
- _reference.release();
- }
- catch (AMQException e)
- {
- // TODO
- throw new RuntimeException(e);
- }
- }
-
- public void onRollback()
- {
- // Maybe keep track of entries that were created and then delete them here in case of failure
- // to in memory enqueue
- _reference.release();
- }
-
-
- }
private class ImmediateAction implements BaseQueue.PostEnqueueAction
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org