Author: rgodfrey
Date: Wed Jun 27 15:14:33 2012
New Revision: 1354573
URL: http://svn.apache.org/viewvc?rev=1354573&view=rev
Log:
NO-JIRA : [Proton-j] get disposition test working and sending of empty messages
Modified:
qpid/proton/trunk/proton-j/jproton.py
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/SenderImpl.java
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/TransportImpl.java
Modified: qpid/proton/trunk/proton-j/jproton.py
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/jproton.py?rev=1354573&r1=1354572&r2=1354573&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/jproton.py (original)
+++ qpid/proton/trunk/proton-j/jproton.py Wed Jun 27 15:14:33 2012
@@ -199,10 +199,20 @@ def pn_disposition(d, p):
if p == PN_ACCEPTED:
d.disposition(Accepted.getInstance())
+
+def pn_remote_disp(d):
+ if(d.getRemoteState() == Accepted.getInstance()):
+ return PN_ACCEPTED
+
def pn_remote_disposition(d):
if(d.getRemoteState() == Accepted.getInstance()):
return PN_ACCEPTED
+def pn_local_disp(d):
+ if(d.getLocalState() == Accepted.getInstance()):
+ return PN_ACCEPTED
+
+
def pn_local_disposition(d):
if(d.getLocalState() == Accepted.getInstance()):
return PN_ACCEPTED
Modified:
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/SenderImpl.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/SenderImpl.java?rev=1354573&r1=1354572&r2=1354573&view=diff
==============================================================================
---
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/SenderImpl.java
(original)
+++
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/SenderImpl.java
Wed Jun 27 15:14:33 2012
@@ -71,6 +71,7 @@ public class SenderImpl extends LinkImp
public boolean advance()
{
DeliveryImpl delivery = current();
+
boolean advance = super.advance();
if(advance && _offered > 0)
{
@@ -79,7 +80,6 @@ public class SenderImpl extends LinkImp
if(advance)
{
decrementCredit();
-
delivery.addToTransportWorkList();
}
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=1354573&r1=1354572&r2=1354573&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
Wed Jun 27 15:14:33 2012
@@ -305,6 +305,7 @@ public class TransportImpl extends Endpo
// TODO partial consumption
delivery.setData(null);
delivery.setDataLength(0);
+ delivery.setDone();
if(delivery.getLink().current() != delivery)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
