You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rh...@apache.org on 2013/12/19 04:48:51 UTC
svn commit: r1552223 - in /qpid/proton/trunk:
proton-c/bindings/java/src/main/java/org/apache/qpid/proton/messenger/jni/
proton-c/bindings/python/ proton-c/include/proton/ proton-c/src/messenger/
proton-j/proton-api/src/main/java/org/apache/qpid/proton...
Author: rhs
Date: Thu Dec 19 03:48:51 2013
New Revision: 1552223
URL: http://svn.apache.org/r1552223
Log:
added released status
Modified:
qpid/proton/trunk/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/messenger/jni/JNIMessenger.java
qpid/proton/trunk/proton-c/bindings/python/proton.py
qpid/proton/trunk/proton-c/include/proton/messenger.h
qpid/proton/trunk/proton-c/src/messenger/store.c
qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/messenger/Status.java
qpid/proton/trunk/proton-j/proton-api/src/main/resources/proton.py
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/messenger/impl/StoreEntry.java
Modified: qpid/proton/trunk/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/messenger/jni/JNIMessenger.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/messenger/jni/JNIMessenger.java?rev=1552223&r1=1552222&r2=1552223&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/messenger/jni/JNIMessenger.java (original)
+++ qpid/proton/trunk/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/messenger/jni/JNIMessenger.java Thu Dec 19 03:48:51 2013
@@ -277,6 +277,10 @@ class JNIMessenger implements Messenger
{
return Status.REJECTED;
}
+ else if (status == pn_status_t.PN_STATUS_RELEASED)
+ {
+ return Status.RELEASED;
+ }
else if (status == pn_status_t.PN_STATUS_SETTLED)
{
return Status.SETTLED;
Modified: qpid/proton/trunk/proton-c/bindings/python/proton.py
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/python/proton.py?rev=1552223&r1=1552222&r2=1552223&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/python/proton.py (original)
+++ qpid/proton/trunk/proton-c/bindings/python/proton.py Thu Dec 19 03:48:51 2013
@@ -142,6 +142,7 @@ EXCEPTIONS = {
PENDING = Constant("PENDING")
ACCEPTED = Constant("ACCEPTED")
REJECTED = Constant("REJECTED")
+RELEASED = Constant("RELEASED")
ABORTED = Constant("ABORTED")
SETTLED = Constant("SETTLED")
@@ -149,6 +150,7 @@ STATUSES = {
PN_STATUS_ABORTED: ABORTED,
PN_STATUS_ACCEPTED: ACCEPTED,
PN_STATUS_REJECTED: REJECTED,
+ PN_STATUS_RELEASED: RELEASED,
PN_STATUS_PENDING: PENDING,
PN_STATUS_SETTLED: SETTLED,
PN_STATUS_UNKNOWN: None
@@ -3187,6 +3189,7 @@ __all__ = [
"PENDING",
"MANUAL",
"REJECTED",
+ "RELEASED",
"SETTLED",
"UNDESCRIBED",
"Array",
Modified: qpid/proton/trunk/proton-c/include/proton/messenger.h
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/include/proton/messenger.h?rev=1552223&r1=1552222&r2=1552223&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/include/proton/messenger.h (original)
+++ qpid/proton/trunk/proton-c/include/proton/messenger.h Thu Dec 19 03:48:51 2013
@@ -43,9 +43,10 @@ typedef enum {
PN_STATUS_PENDING = 1,
PN_STATUS_ACCEPTED = 2,
PN_STATUS_REJECTED = 3,
- PN_STATUS_MODIFIED = 4,
- PN_STATUS_ABORTED = 5,
- PN_STATUS_SETTLED = 6
+ PN_STATUS_RELEASED = 4,
+ PN_STATUS_MODIFIED = 5,
+ PN_STATUS_ABORTED = 6,
+ PN_STATUS_SETTLED = 7
} pn_status_t;
/** Construct a new Messenger with the given name. The name is global.
Modified: qpid/proton/trunk/proton-c/src/messenger/store.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/messenger/store.c?rev=1552223&r1=1552222&r2=1552223&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/messenger/store.c (original)
+++ qpid/proton/trunk/proton-c/src/messenger/store.c Thu Dec 19 03:48:51 2013
@@ -300,7 +300,7 @@ static pn_status_t disp2status(uint64_t
case PN_REJECTED:
return PN_STATUS_REJECTED;
case PN_RELEASED:
- return PN_STATUS_PENDING;
+ return PN_STATUS_RELEASED;
case PN_MODIFIED:
return PN_STATUS_MODIFIED;
default:
Modified: qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/messenger/Status.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/messenger/Status.java?rev=1552223&r1=1552222&r2=1552223&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/messenger/Status.java (original)
+++ qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/messenger/Status.java Thu Dec 19 03:48:51 2013
@@ -26,6 +26,7 @@ public enum Status
PENDING,
ACCEPTED,
REJECTED,
+ RELEASED,
MODIFIED,
ABORTED,
SETTLED
Modified: qpid/proton/trunk/proton-j/proton-api/src/main/resources/proton.py
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton-api/src/main/resources/proton.py?rev=1552223&r1=1552222&r2=1552223&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton-api/src/main/resources/proton.py (original)
+++ qpid/proton/trunk/proton-j/proton-api/src/main/resources/proton.py Thu Dec 19 03:48:51 2013
@@ -63,12 +63,14 @@ class Skipped(Exception):
PENDING = "PENDING"
ACCEPTED = "ACCEPTED"
REJECTED = "REJECTED"
+RELEASED = "RELEASED"
SETTLED = "SETTLED"
STATUSES = {
Status.ACCEPTED: ACCEPTED,
Status.REJECTED: REJECTED,
Status.PENDING: PENDING,
+ Status.RELEASED: RELEASED,
Status.SETTLED: SETTLED,
Status.UNKNOWN: None
}
@@ -1844,6 +1846,7 @@ __all__ = [
"MANUAL",
"PENDING",
"REJECTED",
+ "RELEASED",
"SETTLED",
"char",
"Condition",
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/messenger/impl/StoreEntry.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/messenger/impl/StoreEntry.java?rev=1552223&r1=1552222&r2=1552223&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/messenger/impl/StoreEntry.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/messenger/impl/StoreEntry.java Thu Dec 19 03:48:51 2013
@@ -139,7 +139,7 @@ class StoreEntry
if (disp instanceof Rejected)
return Status.REJECTED;
if (disp instanceof Released)
- return Status.PENDING;
+ return Status.RELEASED;
if (disp instanceof Modified)
return Status.MODIFIED;
assert(false);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org