You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/02/16 15:59:16 UTC
svn commit: r1783241 - in /qpid/java/trunk:
broker-core/src/main/java/org/apache/qpid/server/transport/
broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/
Author: kwall
Date: Thu Feb 16 15:59:16 2017
New Revision: 1783241
URL: http://svn.apache.org/viewvc?rev=1783241&view=rev
Log:
QPID-7622: [Java Broker] [0-10] Move Connection, Session and associated classes to 0-10 plugin
Added:
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Connection.java
- copied, changed from r1783197, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Connection.java
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConnectionDelegate.java
- copied, changed from r1783197, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionDelegate.java
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConnectionInvoker.java
- copied, changed from r1783197, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionInvoker.java
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConnectionListener.java
- copied, changed from r1783197, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionListener.java
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Session.java
- copied, changed from r1783197, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Session.java
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/SessionDelegate.java
- copied, changed from r1783197, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionDelegate.java
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/SessionInvoker.java
- copied, changed from r1783197, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionInvoker.java
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/SessionListener.java
- copied, changed from r1783197, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionListener.java
Removed:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Connection.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionDelegate.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionInvoker.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionListener.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Session.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionDelegate.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionInvoker.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionListener.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Method.java
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10Impl.java
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Method.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Method.java?rev=1783241&r1=1783240&r2=1783241&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Method.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Method.java Thu Feb 16 15:59:16 2017
@@ -63,7 +63,7 @@ public abstract class Method extends Str
return id;
}
- void setId(int id)
+ public void setId(int id)
{
this.id = id;
this.idSet = true;
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10Impl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10Impl.java?rev=1783241&r1=1783240&r2=1783241&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10Impl.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10Impl.java Thu Feb 16 15:59:16 2017
@@ -52,7 +52,6 @@ import org.apache.qpid.server.util.Conne
import org.apache.qpid.server.util.ServerScopedRuntimeException;
import org.apache.qpid.server.transport.ByteBufferSender;
import org.apache.qpid.server.transport.ConnectionCloseCode;
-import org.apache.qpid.server.transport.ConnectionDelegate;
import org.apache.qpid.server.transport.Constant;
Copied: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Connection.java (from r1783197, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Connection.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Connection.java?p2=qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Connection.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Connection.java&r1=1783197&r2=1783241&rev=1783241&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Connection.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Connection.java Thu Feb 16 15:59:16 2017
@@ -18,12 +18,12 @@
* under the License.
*
*/
-package org.apache.qpid.server.transport;
+package org.apache.qpid.server.protocol.v0_10;
-import static org.apache.qpid.server.transport.Connection.State.CLOSED;
-import static org.apache.qpid.server.transport.Connection.State.CLOSING;
-import static org.apache.qpid.server.transport.Connection.State.NEW;
-import static org.apache.qpid.server.transport.Connection.State.OPEN;
+import static org.apache.qpid.server.protocol.v0_10.Connection.State.CLOSED;
+import static org.apache.qpid.server.protocol.v0_10.Connection.State.CLOSING;
+import static org.apache.qpid.server.protocol.v0_10.Connection.State.NEW;
+import static org.apache.qpid.server.protocol.v0_10.Connection.State.OPEN;
import java.net.SocketAddress;
import java.util.ArrayList;
@@ -37,6 +37,18 @@ import java.util.concurrent.atomic.Atomi
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.qpid.server.transport.Binary;
+import org.apache.qpid.server.transport.ConnectionClose;
+import org.apache.qpid.server.transport.ConnectionCloseCode;
+import org.apache.qpid.server.transport.ConnectionException;
+import org.apache.qpid.server.transport.FrameSizeObserver;
+import org.apache.qpid.server.transport.Method;
+import org.apache.qpid.server.transport.Option;
+import org.apache.qpid.server.transport.ProtocolEvent;
+import org.apache.qpid.server.transport.ProtocolEventReceiver;
+import org.apache.qpid.server.transport.ProtocolEventSender;
+import org.apache.qpid.server.transport.SessionDetachCode;
+import org.apache.qpid.server.transport.SessionDetached;
import org.apache.qpid.server.transport.network.NetworkConnection;
import org.apache.qpid.server.transport.util.Waiter;
@@ -52,7 +64,7 @@ import org.apache.qpid.server.transport.
*/
public class Connection extends ConnectionInvoker
- implements ProtocolEventReceiver, ProtocolEventSender
+ implements ProtocolEventReceiver, ProtocolEventSender
{
private static final Logger LOGGER = LoggerFactory.getLogger(Connection.class);
@@ -345,7 +357,7 @@ public class Connection extends Connecti
}
- protected void sendConnectionClose(ConnectionCloseCode replyCode, String replyText, Option ... _options)
+ protected void sendConnectionClose(ConnectionCloseCode replyCode, String replyText, Option... _options)
{
connectionClose(replyCode, replyText, _options);
}
Copied: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConnectionDelegate.java (from r1783197, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionDelegate.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConnectionDelegate.java?p2=qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConnectionDelegate.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionDelegate.java&r1=1783197&r2=1783241&rev=1783241&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionDelegate.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConnectionDelegate.java Thu Feb 16 15:59:16 2017
@@ -18,13 +18,22 @@
* under the License.
*
*/
-package org.apache.qpid.server.transport;
-
-import static org.apache.qpid.server.transport.Connection.State.CLOSE_RCVD;
+package org.apache.qpid.server.protocol.v0_10;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.qpid.server.transport.ConnectionClose;
+import org.apache.qpid.server.transport.ConnectionCloseOk;
+import org.apache.qpid.server.transport.ConnectionException;
+import org.apache.qpid.server.transport.ConnectionHeartbeat;
+import org.apache.qpid.server.transport.Method;
+import org.apache.qpid.server.transport.MethodDelegate;
+import org.apache.qpid.server.transport.ProtocolDelegate;
+import org.apache.qpid.server.transport.ProtocolError;
+import org.apache.qpid.server.transport.SessionDetach;
+import org.apache.qpid.server.transport.SessionDetachCode;
+import org.apache.qpid.server.transport.SessionDetached;
/**
* ConnectionDelegate
@@ -39,8 +48,8 @@ import org.slf4j.LoggerFactory;
* the connectionClose is kind of different for both sides
*/
public abstract class ConnectionDelegate
- extends MethodDelegate<Connection>
- implements ProtocolDelegate<Connection>
+ extends MethodDelegate<Connection>
+ implements ProtocolDelegate<Connection>
{
private static final Logger LOGGER = LoggerFactory.getLogger(ConnectionDelegate.class);
@@ -74,7 +83,7 @@ public abstract class ConnectionDelegate
{
sendConnectionCloseOkAndCloseSender(conn);
conn.closeCode(close);
- conn.setState(CLOSE_RCVD);
+ conn.setState(Connection.State.CLOSE_RCVD);
}
protected void sendConnectionCloseOkAndCloseSender(Connection conn)
Copied: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConnectionInvoker.java (from r1783197, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionInvoker.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConnectionInvoker.java?p2=qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConnectionInvoker.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionInvoker.java&r1=1783197&r2=1783241&rev=1783241&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionInvoker.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConnectionInvoker.java Thu Feb 16 15:59:16 2017
@@ -1,4 +1,3 @@
-package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,13 +18,30 @@ package org.apache.qpid.server.transport
* under the License.
*
*/
+package org.apache.qpid.server.protocol.v0_10;
import java.util.Map;
+import org.apache.qpid.server.transport.ConnectionClose;
+import org.apache.qpid.server.transport.ConnectionCloseCode;
+import org.apache.qpid.server.transport.ConnectionCloseOk;
+import org.apache.qpid.server.transport.ConnectionHeartbeat;
+import org.apache.qpid.server.transport.ConnectionOpen;
+import org.apache.qpid.server.transport.ConnectionOpenOk;
+import org.apache.qpid.server.transport.ConnectionRedirect;
+import org.apache.qpid.server.transport.ConnectionSecure;
+import org.apache.qpid.server.transport.ConnectionSecureOk;
+import org.apache.qpid.server.transport.ConnectionStart;
+import org.apache.qpid.server.transport.ConnectionStartOk;
+import org.apache.qpid.server.transport.ConnectionTune;
+import org.apache.qpid.server.transport.ConnectionTuneOk;
+import org.apache.qpid.server.transport.Method;
+import org.apache.qpid.server.transport.Option;
+
public abstract class ConnectionInvoker {
- final void connectionStart(Map<String,Object> serverProperties, java.util.List<Object> mechanisms, java.util.List<Object> locales, Option ... _options) {
+ final void connectionStart(Map<String,Object> serverProperties, java.util.List<Object> mechanisms, java.util.List<Object> locales, Option... _options) {
invoke(new ConnectionStart(serverProperties, mechanisms, locales, _options));
}
Copied: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConnectionListener.java (from r1783197, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionListener.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConnectionListener.java?p2=qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConnectionListener.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionListener.java&r1=1783197&r2=1783241&rev=1783241&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/ConnectionListener.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConnectionListener.java Thu Feb 16 15:59:16 2017
@@ -18,11 +18,13 @@
* under the License.
*
*/
-package org.apache.qpid.server.transport;
+package org.apache.qpid.server.protocol.v0_10;
import java.util.List;
+import org.apache.qpid.server.transport.ConnectionException;
+
/**
* ConnectionListener
*
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java?rev=1783241&r1=1783240&r2=1783241&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnection.java Thu Feb 16 15:59:16 2017
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.server.protocol.v0_10;
-import static org.apache.qpid.server.transport.Connection.State.CLOSING;
+import static org.apache.qpid.server.protocol.v0_10.Connection.State.CLOSING;
import java.net.SocketAddress;
import java.security.AccessControlContext;
@@ -52,7 +52,6 @@ import org.apache.qpid.server.transport.
import org.apache.qpid.server.transport.ServerNetworkConnection;
import org.apache.qpid.server.util.Action;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
-import org.apache.qpid.server.transport.Connection;
import org.apache.qpid.server.transport.ConnectionClose;
import org.apache.qpid.server.transport.ConnectionCloseCode;
import org.apache.qpid.server.transport.ConnectionCloseOk;
@@ -61,7 +60,6 @@ import org.apache.qpid.server.transport.
import org.apache.qpid.server.transport.Method;
import org.apache.qpid.server.transport.Option;
import org.apache.qpid.server.transport.ProtocolEvent;
-import org.apache.qpid.server.transport.Session;
public class ServerConnection extends Connection
{
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java?rev=1783241&r1=1783240&r2=1783241&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java Thu Feb 16 15:59:16 2017
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.server.protocol.v0_10;
-import static org.apache.qpid.server.transport.Connection.State.CLOSE_RCVD;
+import static org.apache.qpid.server.protocol.v0_10.Connection.State.CLOSE_RCVD;
import java.security.AccessControlException;
import java.security.Principal;
@@ -50,10 +50,8 @@ import org.apache.qpid.server.transport.
import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
import org.apache.qpid.server.virtualhost.VirtualHostUnavailableException;
import org.apache.qpid.server.transport.Binary;
-import org.apache.qpid.server.transport.Connection;
import org.apache.qpid.server.transport.ConnectionClose;
import org.apache.qpid.server.transport.ConnectionCloseCode;
-import org.apache.qpid.server.transport.ConnectionDelegate;
import org.apache.qpid.server.transport.ConnectionOpen;
import org.apache.qpid.server.transport.ConnectionOpenOk;
import org.apache.qpid.server.transport.ConnectionRedirect;
@@ -62,9 +60,7 @@ import org.apache.qpid.server.transport.
import org.apache.qpid.server.transport.ConnectionTuneOk;
import org.apache.qpid.server.transport.Constant;
import org.apache.qpid.server.transport.ProtocolHeader;
-import org.apache.qpid.server.transport.Session;
import org.apache.qpid.server.transport.SessionAttach;
-import org.apache.qpid.server.transport.SessionDelegate;
import org.apache.qpid.server.transport.SessionDetach;
import org.apache.qpid.server.transport.SessionDetachCode;
import org.apache.qpid.server.transport.SessionDetached;
Copied: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Session.java (from r1783197, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Session.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Session.java?p2=qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Session.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Session.java&r1=1783197&r2=1783241&rev=1783241&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/Session.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Session.java Thu Feb 16 15:59:16 2017
@@ -18,18 +18,18 @@
* under the License.
*
*/
-package org.apache.qpid.server.transport;
+package org.apache.qpid.server.protocol.v0_10;
import static org.apache.qpid.server.transport.Option.COMPLETED;
import static org.apache.qpid.server.transport.Option.SYNC;
import static org.apache.qpid.server.transport.Option.TIMELY_REPLY;
-import static org.apache.qpid.server.transport.Session.State.CLOSED;
-import static org.apache.qpid.server.transport.Session.State.CLOSING;
-import static org.apache.qpid.server.transport.Session.State.DETACHED;
-import static org.apache.qpid.server.transport.Session.State.NEW;
-import static org.apache.qpid.server.transport.Session.State.OPEN;
-import static org.apache.qpid.server.transport.Session.State.RESUMING;
+import static org.apache.qpid.server.protocol.v0_10.Session.State.CLOSED;
+import static org.apache.qpid.server.protocol.v0_10.Session.State.CLOSING;
+import static org.apache.qpid.server.protocol.v0_10.Session.State.DETACHED;
+import static org.apache.qpid.server.protocol.v0_10.Session.State.NEW;
+import static org.apache.qpid.server.protocol.v0_10.Session.State.OPEN;
+import static org.apache.qpid.server.protocol.v0_10.Session.State.RESUMING;
import static org.apache.qpid.server.util.Serial.ge;
import static org.apache.qpid.server.util.Serial.gt;
import static org.apache.qpid.server.util.Serial.le;
@@ -46,6 +46,7 @@ import java.util.concurrent.atomic.Atomi
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.qpid.server.transport.*;
import org.apache.qpid.server.transport.network.Frame;
import org.apache.qpid.server.transport.util.Waiter;
@@ -227,32 +228,32 @@ public class Session extends SessionInvo
}
else if (m instanceof MessageTransfer)
{
- MessageTransfer xfr = (MessageTransfer)m;
+ MessageTransfer xfr = (MessageTransfer)m;
Header header = xfr.getHeader();
if (header != null)
- {
- if (header.getDeliveryProperties() != null)
- {
- header.getDeliveryProperties().setRedelivered(true);
- }
- else
- {
- DeliveryProperties deliveryProps = new DeliveryProperties();
- deliveryProps.setRedelivered(true);
+ {
+ if (header.getDeliveryProperties() != null)
+ {
+ header.getDeliveryProperties().setRedelivered(true);
+ }
+ else
+ {
+ DeliveryProperties deliveryProps = new DeliveryProperties();
+ deliveryProps.setRedelivered(true);
- xfr.setHeader(new Header(deliveryProps, header.getMessageProperties(),
+ xfr.setHeader(new Header(deliveryProps, header.getMessageProperties(),
header.getNonStandardProperties()));
- }
+ }
- }
- else
- {
- DeliveryProperties deliveryProps = new DeliveryProperties();
- deliveryProps.setRedelivered(true);
- xfr.setHeader(new Header(deliveryProps, null, null));
- }
+ }
+ else
+ {
+ DeliveryProperties deliveryProps = new DeliveryProperties();
+ deliveryProps.setRedelivered(true);
+ xfr.setHeader(new Header(deliveryProps, null, null));
+ }
}
sessionCommandPoint(m.getId(), 0);
send(m);
@@ -413,7 +414,7 @@ public class Session extends SessionInvo
sessionExpected(rs, null);
}
- public void flushProcessed(Option ... options)
+ public void flushProcessed(Option... options)
{
RangeSet copy;
synchronized (processedLock)
@@ -429,7 +430,7 @@ public class Session extends SessionInvo
}
if (copy.size() > 0)
{
- sessionCompleted(copy, options);
+ sessionCompleted(copy, options);
}
}
}
@@ -764,8 +765,8 @@ public class Session extends SessionInvo
if (state != CLOSED)
{
throw new SessionException(
- String.format("timed out waiting for sync: complete = %s, point = %s",
- maxComplete, point));
+ String.format("timed out waiting for sync: complete = %s, point = %s",
+ maxComplete, point));
}
else
{
Copied: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/SessionDelegate.java (from r1783197, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionDelegate.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/SessionDelegate.java?p2=qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/SessionDelegate.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionDelegate.java&r1=1783197&r2=1783241&rev=1783241&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionDelegate.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/SessionDelegate.java Thu Feb 16 15:59:16 2017
@@ -18,11 +18,12 @@
* under the License.
*
*/
-package org.apache.qpid.server.transport;
+package org.apache.qpid.server.protocol.v0_10;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.qpid.server.transport.*;
/**
@@ -32,8 +33,8 @@ import org.slf4j.LoggerFactory;
*/
public class SessionDelegate
- extends MethodDelegate<Session>
- implements ProtocolDelegate<Session>
+ extends MethodDelegate<Session>
+ implements ProtocolDelegate<Session>
{
private static final Logger LOGGER = LoggerFactory.getLogger(SessionDelegate.class);
Copied: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/SessionInvoker.java (from r1783197, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionInvoker.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/SessionInvoker.java?p2=qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/SessionInvoker.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionInvoker.java&r1=1783197&r2=1783241&rev=1783241&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionInvoker.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/SessionInvoker.java Thu Feb 16 15:59:16 2017
@@ -1,4 +1,3 @@
-package org.apache.qpid.server.transport;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,13 +18,16 @@ package org.apache.qpid.server.transport
* under the License.
*
*/
+package org.apache.qpid.server.protocol.v0_10;
import java.util.Map;
+import org.apache.qpid.server.transport.*;
+
public abstract class SessionInvoker {
- final void sessionAttach(byte[] name, Option ... _options) {
+ final void sessionAttach(byte[] name, Option... _options) {
invoke(new SessionAttach(name, _options));
}
Copied: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/SessionListener.java (from r1783197, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionListener.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/SessionListener.java?p2=qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/SessionListener.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionListener.java&r1=1783197&r2=1783241&rev=1783241&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SessionListener.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/SessionListener.java Thu Feb 16 15:59:16 2017
@@ -18,9 +18,12 @@
* under the License.
*
*/
-package org.apache.qpid.server.transport;
+package org.apache.qpid.server.protocol.v0_10;
+import org.apache.qpid.server.transport.MessageTransfer;
+import org.apache.qpid.server.transport.SessionException;
+
/**
* SessionListener
*
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org