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 2016/11/18 23:13:28 UTC
svn commit: r1770446 - in
/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0:
./ transport/
Author: rgodfrey
Date: Fri Nov 18 23:13:28 2016
New Revision: 1770446
URL: http://svn.apache.org/viewvc?rev=1770446&view=rev
Log:
QPID-7529 : Tidy up AMQP 1.0 classes/interfaces
Added:
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLink_1_0.java (with props)
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardReceivingLink_1_0.java
- copied, changed from r1770445, qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLink_1_0.java
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorReceivingLink_1_0.java
- copied, changed from r1770445, qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java
Removed:
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/LinkEventListener.java
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLinkListener.java
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLinkListener.java
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/transport/
Modified:
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/LinkEndpoint.java
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Link_1_0.java
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLinkEndpoint.java
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLinkEndpoint.java
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/LinkEndpoint.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/LinkEndpoint.java?rev=1770446&r1=1770445&r2=1770446&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/LinkEndpoint.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/LinkEndpoint.java Fri Nov 18 23:13:28 2016
@@ -41,10 +41,10 @@ import org.apache.qpid.server.protocol.v
import org.apache.qpid.server.protocol.v1_0.type.transport.Role;
import org.apache.qpid.server.protocol.v1_0.type.transport.SenderSettleMode;
-public abstract class LinkEndpoint<T extends LinkEventListener>
+public abstract class LinkEndpoint<T extends Link_1_0>
{
- private T _linkEventListener;
+ private T _link;
private DeliveryStateHandler _deliveryStateHandler;
private Object _flowTransactionId;
private SenderSettleMode _sendingSettlementMode;
@@ -55,9 +55,6 @@ public abstract class LinkEndpoint<T ext
private volatile boolean _stopped;
private volatile boolean _stoppedUpdated;
- private Link_1_0 _link;
-
-
private enum State
{
DETACHED,
@@ -87,11 +84,6 @@ public abstract class LinkEndpoint<T ext
private Map<Binary,Delivery> _unsettledTransfers = new HashMap<Binary,Delivery>();
- LinkEndpoint(final Session_1_0 sessionEndpoint, String name, Map<Binary, Outcome> unsettled)
- {
- this(sessionEndpoint, name, unsettled, null);
- }
-
LinkEndpoint(final Session_1_0 sessionEndpoint, String name, Map<Binary, Outcome> unsettled, DeliveryStateHandler deliveryStateHandler)
{
_name = name;
@@ -204,7 +196,7 @@ public abstract class LinkEndpoint<T ext
break;
case ATTACHED:
_state = State.DETACH_RECVD;
- _linkEventListener.remoteDetached(LinkEndpoint.this, detach);
+ _link.remoteDetached(LinkEndpoint.this, detach);
break;
}
}
@@ -476,14 +468,14 @@ public abstract class LinkEndpoint<T ext
}
}
- public T getLinkEventListener()
+ public T getLink()
{
- return _linkEventListener;
+ return _link;
}
- public void setLinkEventListener(final T linkEventListener)
+ public void setLink(final T link)
{
- _linkEventListener = linkEventListener;
+ _link = link;
}
public void setDeliveryStateHandler(final DeliveryStateHandler deliveryStateHandler)
@@ -524,16 +516,6 @@ public abstract class LinkEndpoint<T ext
_localUnsettled = unsettled;
}
- public Link_1_0 getLink()
- {
- return _link;
- }
-
- public void setLink(final Link_1_0 link)
- {
- _link = link;
- }
-
@Override public String toString()
{
return "LinkEndpoint{" +
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Link_1_0.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Link_1_0.java?rev=1770446&r1=1770445&r2=1770446&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Link_1_0.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Link_1_0.java Fri Nov 18 23:13:28 2016
@@ -21,8 +21,12 @@
package org.apache.qpid.server.protocol.v1_0;
import org.apache.qpid.server.protocol.LinkModel;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Detach;
public interface Link_1_0 extends LinkModel
{
+
+ void remoteDetached(final LinkEndpoint endpoint, Detach detach);
+
void start();
}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLinkEndpoint.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLinkEndpoint.java?rev=1770446&r1=1770445&r2=1770446&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLinkEndpoint.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLinkEndpoint.java Fri Nov 18 23:13:28 2016
@@ -41,7 +41,7 @@ import org.apache.qpid.server.protocol.v
import org.apache.qpid.server.protocol.v1_0.type.transport.Role;
import org.apache.qpid.server.protocol.v1_0.type.transport.Transfer;
-public class ReceivingLinkEndpoint extends LinkEndpoint<ReceivingLinkListener>
+public class ReceivingLinkEndpoint extends LinkEndpoint<ReceivingLink_1_0>
{
@@ -97,7 +97,6 @@ public class ReceivingLinkEndpoint exten
{
super(session, attach);
setDeliveryCount(attach.getInitialDeliveryCount());
- setLinkEventListener(ReceivingLinkListener.DEFAULT);
setSendingSettlementMode(attach.getSndSettleMode());
setReceivingSettlementMode(attach.getRcvSettleMode());
}
@@ -149,7 +148,7 @@ public class ReceivingLinkEndpoint exten
{
_unsettledMap.remove(deliveryTag);
}
- getLinkEventListener().messageTransfer(transfer);
+ getLink().messageTransfer(transfer);
}
Added: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLink_1_0.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLink_1_0.java?rev=1770446&view=auto
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLink_1_0.java (added)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLink_1_0.java Fri Nov 18 23:13:28 2016
@@ -0,0 +1,28 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF 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.apache.qpid.server.protocol.v1_0;
+
+import org.apache.qpid.server.protocol.v1_0.type.transport.Transfer;
+
+public interface ReceivingLink_1_0 extends Link_1_0
+{
+ void messageTransfer(Transfer xfr);
+}
Propchange: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLink_1_0.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLinkEndpoint.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLinkEndpoint.java?rev=1770446&r1=1770445&r2=1770446&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLinkEndpoint.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLinkEndpoint.java Fri Nov 18 23:13:28 2016
@@ -34,7 +34,7 @@ import org.apache.qpid.server.protocol.v
import org.apache.qpid.server.protocol.v1_0.type.transport.Role;
import org.apache.qpid.server.protocol.v1_0.type.transport.Transfer;
-public class SendingLinkEndpoint extends LinkEndpoint<SendingLinkListener>
+public class SendingLinkEndpoint extends LinkEndpoint<SendingLink_1_0>
{
public static final Symbol PRIORITY = Symbol.valueOf("priority");
@@ -96,7 +96,6 @@ public class SendingLinkEndpoint extends
{
setDeliveryCount(UnsignedInteger.valueOf(0));
setAvailable(UnsignedInteger.valueOf(0));
- setLinkEventListener(SendingLinkListener.DEFAULT);
}
@Override public Role getRole()
@@ -186,7 +185,7 @@ public class SendingLinkEndpoint extends
@Override
public void flowStateChanged()
{
- getLinkEventListener().flowStateChanged();
+ getLink().flowStateChanged();
}
public boolean hasCreditToSend()
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java?rev=1770446&r1=1770445&r2=1770446&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java Fri Nov 18 23:13:28 2016
@@ -77,7 +77,7 @@ import org.apache.qpid.server.txn.Server
import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
import org.apache.qpid.server.virtualhost.QueueExistsException;
-public class SendingLink_1_0 implements SendingLinkListener, Link_1_0, DeliveryStateHandler
+public class SendingLink_1_0 implements Link_1_0, DeliveryStateHandler
{
private static final Logger _logger = LoggerFactory.getLogger(SendingLink_1_0.class);
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java?rev=1770446&r1=1770445&r2=1770446&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java Fri Nov 18 23:13:28 2016
@@ -24,8 +24,6 @@ import static org.apache.qpid.server.log
import java.security.AccessControlContext;
import java.security.AccessControlException;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
@@ -839,8 +837,7 @@ public class Session_1_0 implements AMQS
(SendingDestination) destination
);
- sendingLinkEndpoint.setLinkEventListener(new SubjectSpecificSendingLinkListener(
- sendingLink));
+ sendingLinkEndpoint.setLink(sendingLink);
registerConsumer(sendingLink);
link = sendingLink;
@@ -876,7 +873,7 @@ public class Session_1_0 implements AMQS
endpoint.setSource(oldSource);
SendingLinkEndpoint sendingLinkEndpoint = (SendingLinkEndpoint) endpoint;
previousLink.setLinkAttachment(new SendingLinkAttachment(this, sendingLinkEndpoint));
- sendingLinkEndpoint.setLinkEventListener(new SubjectSpecificSendingLinkListener(previousLink));
+ sendingLinkEndpoint.setLink(previousLink);
link = previousLink;
endpoint.setLocalUnsettled(previousLink.getUnsettledOutcomeMap());
registerConsumer(previousLink);
@@ -919,13 +916,12 @@ public class Session_1_0 implements AMQS
}*/
final ReceivingLinkEndpoint receivingLinkEndpoint = (ReceivingLinkEndpoint) endpoint;
- final TxnCoordinatorLink_1_0 coordinatorLink =
- new TxnCoordinatorLink_1_0(getAddressSpace(),
- this,
- receivingLinkEndpoint,
- _openTransactions);
- receivingLinkEndpoint.setLinkEventListener(new SubjectSpecificReceivingLinkListener(
- coordinatorLink));
+ final TxnCoordinatorReceivingLink_1_0 coordinatorLink =
+ new TxnCoordinatorReceivingLink_1_0(getAddressSpace(),
+ this,
+ receivingLinkEndpoint,
+ _openTransactions);
+ receivingLinkEndpoint.setLink(coordinatorLink);
link = coordinatorLink;
@@ -933,8 +929,8 @@ public class Session_1_0 implements AMQS
else
{
- ReceivingLink_1_0 previousLink =
- (ReceivingLink_1_0) linkRegistry.getDurableReceivingLink(endpoint.getName());
+ StandardReceivingLink_1_0 previousLink =
+ (StandardReceivingLink_1_0) linkRegistry.getDurableReceivingLink(endpoint.getName());
if (previousLink == null)
{
@@ -1026,13 +1022,12 @@ public class Session_1_0 implements AMQS
if (destination != null)
{
final ReceivingLinkEndpoint receivingLinkEndpoint = (ReceivingLinkEndpoint) endpoint;
- final ReceivingLink_1_0 receivingLink =
- new ReceivingLink_1_0(new ReceivingLinkAttachment(this, receivingLinkEndpoint),
- getAddressSpace(),
- (ReceivingDestination) destination);
+ final StandardReceivingLink_1_0 receivingLink =
+ new StandardReceivingLink_1_0(new ReceivingLinkAttachment(this, receivingLinkEndpoint),
+ getAddressSpace(),
+ (ReceivingDestination) destination);
- receivingLinkEndpoint.setLinkEventListener(new SubjectSpecificReceivingLinkListener(
- receivingLink));
+ receivingLinkEndpoint.setLink(receivingLink);
link = receivingLink;
if (TerminusDurability.UNSETTLED_STATE.equals(target.getDurable())
|| TerminusDurability.CONFIGURATION.equals(target.getDurable()))
@@ -1045,7 +1040,7 @@ public class Session_1_0 implements AMQS
{
ReceivingLinkEndpoint receivingLinkEndpoint = (ReceivingLinkEndpoint) endpoint;
previousLink.setLinkAttachment(new ReceivingLinkAttachment(this, receivingLinkEndpoint));
- receivingLinkEndpoint.setLinkEventListener(previousLink);
+ receivingLinkEndpoint.setLink(previousLink);
link = previousLink;
endpoint.setLocalUnsettled(previousLink.getUnsettledOutcomeMap());
@@ -1066,7 +1061,6 @@ public class Session_1_0 implements AMQS
}
else
{
- endpoint.setLink(link);
link.start();
}
}
@@ -1316,7 +1310,7 @@ public class Session_1_0 implements AMQS
for (ReceivingLinkEndpoint endpoint : _receivingLinkMap.values())
{
- ReceivingLink_1_0 link = (ReceivingLink_1_0) endpoint.getLink();
+ StandardReceivingLink_1_0 link = (StandardReceivingLink_1_0) endpoint.getLink();
if (queue == link.getDestination())
{
endpoint.setStopped(true);
@@ -1350,7 +1344,7 @@ public class Session_1_0 implements AMQS
}
for (ReceivingLinkEndpoint endpoint : _receivingLinkMap.values())
{
- ReceivingLink_1_0 link = (ReceivingLink_1_0) endpoint.getLink();
+ StandardReceivingLink_1_0 link = (StandardReceivingLink_1_0) endpoint.getLink();
if (queue == link.getDestination())
{
endpoint.setStopped(false);
@@ -1412,7 +1406,7 @@ public class Session_1_0 implements AMQS
}
for(ReceivingLinkEndpoint endpoint : _receivingLinkMap.values())
{
- ReceivingLink_1_0 link = (ReceivingLink_1_0) endpoint.getLink();
+ StandardReceivingLink_1_0 link = (StandardReceivingLink_1_0) endpoint.getLink();
if(!_blockingEntities.contains(link.getDestination()))
{
endpoint.setStopped(false);
@@ -1548,84 +1542,6 @@ public class Session_1_0 implements AMQS
return _securityToken;
}
-
- private class SubjectSpecificReceivingLinkListener implements ReceivingLinkListener
- {
- private final ReceivingLinkListener _linkListener;
-
- public SubjectSpecificReceivingLinkListener(final ReceivingLinkListener linkListener)
- {
- _linkListener = linkListener;
- }
-
- @Override
- public void messageTransfer(final Transfer xfr)
- {
- AccessController.doPrivileged(new PrivilegedAction<Object>()
- {
- @Override
- public Object run()
- {
- _linkListener.messageTransfer(xfr);
- return null;
- }
- }, _accessControllerContext);
- }
-
- @Override
- public void remoteDetached(final LinkEndpoint endpoint, final Detach detach)
- {
- AccessController.doPrivileged(new PrivilegedAction<Object>()
- {
- @Override
- public Object run()
- {
- _linkListener.remoteDetached(endpoint, detach);
- return null;
- }
- }, _accessControllerContext);
- }
- }
-
- private class SubjectSpecificSendingLinkListener implements SendingLinkListener
- {
- private final SendingLink_1_0 _previousLink;
-
- public SubjectSpecificSendingLinkListener(final SendingLink_1_0 previousLink)
- {
- _previousLink = previousLink;
- }
-
- @Override
- public void flowStateChanged()
- {
- AccessController.doPrivileged(new PrivilegedAction<Object>()
- {
- @Override
- public Object run()
- {
- _previousLink.flowStateChanged();
- return null;
- }
- }, _accessControllerContext);
- }
-
- @Override
- public void remoteDetached(final LinkEndpoint endpoint, final Detach detach)
- {
- AccessController.doPrivileged(new PrivilegedAction<Object>()
- {
- @Override
- public Object run()
- {
- _previousLink.remoteDetached(endpoint, detach);
- return null;
- }
- }, _accessControllerContext);
- }
- }
-
-
@Override
public Collection<Consumer<?>> getConsumers()
{
@@ -1816,7 +1732,8 @@ public class Session_1_0 implements AMQS
for(LinkEndpoint<?> linkEndpoint : _receivingLinkMap.values())
{
- final ReceivingLink_1_0 link = (ReceivingLink_1_0) linkRegistry.getDurableReceivingLink(linkEndpoint.getName());
+ final StandardReceivingLink_1_0
+ link = (StandardReceivingLink_1_0) linkRegistry.getDurableReceivingLink(linkEndpoint.getName());
if (link != null)
{
Copied: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardReceivingLink_1_0.java (from r1770445, qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLink_1_0.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardReceivingLink_1_0.java?p2=qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardReceivingLink_1_0.java&p1=qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLink_1_0.java&r1=1770445&r2=1770446&rev=1770446&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ReceivingLink_1_0.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardReceivingLink_1_0.java Fri Nov 18 23:13:28 2016
@@ -48,7 +48,7 @@ import org.apache.qpid.server.store.Stor
import org.apache.qpid.server.txn.AutoCommitTransaction;
import org.apache.qpid.server.txn.ServerTransaction;
-public class ReceivingLink_1_0 implements ReceivingLinkListener, Link_1_0, DeliveryStateHandler
+public class StandardReceivingLink_1_0 implements ReceivingLink_1_0, DeliveryStateHandler
{
private NamedAddressSpace _addressSpace;
@@ -66,8 +66,8 @@ public class ReceivingLink_1_0 implement
private ReceiverSettleMode _receivingSettlementMode;
- public ReceivingLink_1_0(ReceivingLinkAttachment receivingLinkAttachment, NamedAddressSpace addressSpace,
- ReceivingDestination destination)
+ public StandardReceivingLink_1_0(ReceivingLinkAttachment receivingLinkAttachment, NamedAddressSpace addressSpace,
+ ReceivingDestination destination)
{
_addressSpace = addressSpace;
_destination = destination;
Copied: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorReceivingLink_1_0.java (from r1770445, qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorReceivingLink_1_0.java?p2=qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorReceivingLink_1_0.java&p1=qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java&r1=1770445&r2=1770446&rev=1770446&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorReceivingLink_1_0.java Fri Nov 18 23:13:28 2016
@@ -48,9 +48,9 @@ import org.apache.qpid.bytebuffer.QpidBy
import org.apache.qpid.server.txn.LocalTransaction;
import org.apache.qpid.server.txn.ServerTransaction;
-public class TxnCoordinatorLink_1_0 implements ReceivingLinkListener, Link_1_0
+public class TxnCoordinatorReceivingLink_1_0 implements ReceivingLink_1_0
{
- private static final Logger _logger = LoggerFactory.getLogger(TxnCoordinatorLink_1_0.class);
+ private static final Logger _logger = LoggerFactory.getLogger(TxnCoordinatorReceivingLink_1_0.class);
private NamedAddressSpace _namedAddressSpace;
private ReceivingLinkEndpoint _endpoint;
@@ -60,9 +60,9 @@ public class TxnCoordinatorLink_1_0 impl
private Session_1_0 _session;
- public TxnCoordinatorLink_1_0(NamedAddressSpace namedAddressSpace,
- Session_1_0 session_1_0, ReceivingLinkEndpoint endpoint,
- LinkedHashMap<Integer, ServerTransaction> openTransactions)
+ public TxnCoordinatorReceivingLink_1_0(NamedAddressSpace namedAddressSpace,
+ Session_1_0 session_1_0, ReceivingLinkEndpoint endpoint,
+ LinkedHashMap<Integer, ServerTransaction> openTransactions)
{
_namedAddressSpace = namedAddressSpace;
_session = session_1_0;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org