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 2012/05/29 20:32:49 UTC
svn commit: r1343898 - in
/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine: ./ impl/
Author: rgodfrey
Date: Tue May 29 18:32:48 2012
New Revision: 1343898
URL: http://svn.apache.org/viewvc?rev=1343898&view=rev
Log:
Proton-j: fix acting as client when sending begin
Modified:
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Accepted.java
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Connection.java
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Delivery.java
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/DeliveryBuffer.java
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Endpoint.java
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Link.java
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Modified.java
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Outcome.java
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Received.java
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Receiver.java
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Rejected.java
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Released.java
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Sender.java
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Session.java
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Transport.java
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/ConnectionImpl.java
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/TransportImpl.java
Modified: qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Accepted.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Accepted.java?rev=1343898&r1=1343897&r2=1343898&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Accepted.java (original)
+++ qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Accepted.java Tue May 29 18:32:48 2012
@@ -23,9 +23,6 @@ package org.apache.qpid.proton.engine;
/**
* Accepted
- *
- * @hidden
- *
*/
public class Accepted implements Outcome
Modified: qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Connection.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Connection.java?rev=1343898&r1=1343897&r2=1343898&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Connection.java (original)
+++ qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Connection.java Tue May 29 18:32:48 2012
@@ -26,12 +26,6 @@ import java.util.EnumSet;
/**
* Connection
*
- * @opt operations
- * @opt types
- *
- * @composed 1 - "0..n" Session
- * @composed 1 - "0..?" Transport
- *
*/
public interface Connection extends Endpoint
Modified: qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Delivery.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Delivery.java?rev=1343898&r1=1343897&r2=1343898&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Delivery.java (original)
+++ qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Delivery.java Tue May 29 18:32:48 2012
@@ -24,11 +24,6 @@ package org.apache.qpid.proton.engine;
/**
* Delivery
*
- * @opt operations
- * @opt types
- *
- * @assoc - - 1 DeliveryState
- *
*/
public interface Delivery
Modified: qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/DeliveryBuffer.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/DeliveryBuffer.java?rev=1343898&r1=1343897&r2=1343898&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/DeliveryBuffer.java (original)
+++ qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/DeliveryBuffer.java Tue May 29 18:32:48 2012
@@ -24,12 +24,6 @@ package org.apache.qpid.proton.engine;
/**
* DeliveryBuffer
*
- * @opt operations
- * @opt attributes
- * @opt types
- *
- * @composed 1 - "0..n" Delivery
- *
*/
public interface DeliveryBuffer
Modified: qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Endpoint.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Endpoint.java?rev=1343898&r1=1343897&r2=1343898&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Endpoint.java (original)
+++ qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Endpoint.java Tue May 29 18:32:48 2012
@@ -24,13 +24,6 @@ package org.apache.qpid.proton.engine;
/**
* Endpoint
*
- * @opt operations
- * @opt types
- *
- * @assoc - local 1 Endpoint.State
- * @assoc - remote 1 Endpoint.State
- * @assoc - local 0..1 Endpoint.EndpointError
- * @assoc - remote 0..1 Endpoint.EndpointError
*/
public interface Endpoint
Modified: qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Link.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Link.java?rev=1343898&r1=1343897&r2=1343898&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Link.java (original)
+++ qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Link.java Tue May 29 18:32:48 2012
@@ -25,11 +25,6 @@ import java.util.EnumSet;
/**
* Link
*
- * @opt operations
- * @opt types
- *
- * @assoc 1 - n Delivery
- *
*/
public interface Link extends Endpoint
Modified: qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Modified.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Modified.java?rev=1343898&r1=1343897&r2=1343898&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Modified.java (original)
+++ qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Modified.java Tue May 29 18:32:48 2012
@@ -24,8 +24,6 @@ package org.apache.qpid.proton.engine;
/**
* Modified
*
- * @hidden
- *
*/
public interface Modified extends Outcome
Modified: qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Outcome.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Outcome.java?rev=1343898&r1=1343897&r2=1343898&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Outcome.java (original)
+++ qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Outcome.java Tue May 29 18:32:48 2012
@@ -24,8 +24,6 @@ package org.apache.qpid.proton.engine;
/**
* Outcome
*
- * @hidden
- *
*/
public interface Outcome extends DeliveryState
Modified: qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Received.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Received.java?rev=1343898&r1=1343897&r2=1343898&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Received.java (original)
+++ qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Received.java Tue May 29 18:32:48 2012
@@ -24,8 +24,6 @@ package org.apache.qpid.proton.engine;
/**
* Received
*
- * @hidden
- *
*/
public interface Received extends DeliveryState
Modified: qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Receiver.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Receiver.java?rev=1343898&r1=1343897&r2=1343898&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Receiver.java (original)
+++ qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Receiver.java Tue May 29 18:32:48 2012
@@ -24,9 +24,6 @@ package org.apache.qpid.proton.engine;
/**
* Receiver
*
- * @opt operations
- * @opt types
- *
*/
public interface Receiver extends Link
Modified: qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Rejected.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Rejected.java?rev=1343898&r1=1343897&r2=1343898&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Rejected.java (original)
+++ qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Rejected.java Tue May 29 18:32:48 2012
@@ -24,8 +24,6 @@ package org.apache.qpid.proton.engine;
/**
* Rejected
*
- * @hidden
- *
*/
public interface Rejected extends Outcome
Modified: qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Released.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Released.java?rev=1343898&r1=1343897&r2=1343898&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Released.java (original)
+++ qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Released.java Tue May 29 18:32:48 2012
@@ -24,8 +24,6 @@ package org.apache.qpid.proton.engine;
/**
* Released
*
- * @hidden
- *
*/
public interface Released extends Outcome
Modified: qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Sender.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Sender.java?rev=1343898&r1=1343897&r2=1343898&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Sender.java (original)
+++ qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Sender.java Tue May 29 18:32:48 2012
@@ -24,9 +24,6 @@ package org.apache.qpid.proton.engine;
/**
* Sender
*
- * @opt operations
- * @opt types
- *
*/
public interface Sender extends Link
Modified: qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Session.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Session.java?rev=1343898&r1=1343897&r2=1343898&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Session.java (original)
+++ qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Session.java Tue May 29 18:32:48 2012
@@ -26,13 +26,6 @@ import java.util.EnumSet;
/**
* Session
*
- * @opt operations
- * @opt types
- *
- * @composed 1 - "0..n" Link
- * @composed 1 incoming 1 DeliveryBuffer
- * @composed 1 outgoing 1 DeliveryBuffer
- *
*/
public interface Session extends Endpoint
Modified: qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Transport.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Transport.java?rev=1343898&r1=1343897&r2=1343898&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Transport.java (original)
+++ qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Transport.java Tue May 29 18:32:48 2012
@@ -24,9 +24,6 @@ package org.apache.qpid.proton.engine;
/**
* Transport
*
- * @opt operations
- * @opt types
- *
*/
public interface Transport extends Endpoint
Modified: qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/ConnectionImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/ConnectionImpl.java?rev=1343898&r1=1343897&r2=1343898&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/ConnectionImpl.java (original)
+++ qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/ConnectionImpl.java Tue May 29 18:32:48 2012
@@ -62,6 +62,7 @@ public class ConnectionImpl extends Endp
SessionImpl session = new SessionImpl(this);
_sessions.add(session);
+
return session;
}
Modified: qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/TransportImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/TransportImpl.java?rev=1343898&r1=1343897&r2=1343898&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/TransportImpl.java (original)
+++ qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/TransportImpl.java Tue May 29 18:32:48 2012
@@ -92,8 +92,8 @@ public class TransportImpl extends Endpo
public TransportImpl(Connection connectionEndpoint)
{
_connectionEndpoint = (ConnectionImpl) connectionEndpoint;
- _localSessions = new TransportSession[_connectionEndpoint.getMaxChannels()];
- _remoteSessions = new TransportSession[_connectionEndpoint.getMaxChannels()];
+ _localSessions = new TransportSession[_connectionEndpoint.getMaxChannels()+1];
+ _remoteSessions = new TransportSession[_connectionEndpoint.getMaxChannels()+1];
_frameParser = new FrameParser(this);
}
@@ -416,17 +416,23 @@ public class TransportImpl extends Endpo
{
SessionImpl session = (SessionImpl) endpoint;
TransportSession transportSession = getTransportState(session);
- if(session.getLocalState() == EndpointState.ACTIVE
- && session.getRemoteState() == EndpointState.ACTIVE
- && !transportSession.isLocalChannelSet())
+ if(session.getLocalState() == EndpointState.ACTIVE)
{
int channelId = allocateLocalChannel();
- transportSession.setLocalChannel(channelId);
- _localSessions[channelId] = transportSession;
Begin begin = new Begin();
- begin.setRemoteChannel(UnsignedShort.valueOf((short) transportSession.getRemoteChannel()));
+ if(session.getRemoteState() == EndpointState.ACTIVE
+ && !transportSession.isLocalChannelSet())
+ {
+ transportSession.setLocalChannel(channelId);
+ _localSessions[channelId] = transportSession;
+ }
+
+ if(session.getRemoteState() != EndpointState.UNINITIALIZED)
+ {
+ begin.setRemoteChannel(UnsignedShort.valueOf((short) transportSession.getRemoteChannel()));
+ }
begin.setHandleMax(transportSession.getHandleMax());
begin.setIncomingWindow(transportSession.getIncomingWindowSize());
begin.setOutgoingWindow(transportSession.getOutgoingWindowSize());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org