You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2017/02/07 20:52:11 UTC
[01/13] qpid-proton git commit: PROTON-1385: remove java/jython
specific codeblock from proton-c python wrapper
Repository: qpid-proton
Updated Branches:
refs/heads/go1 5c4f4d7f4 -> ed8e879f6
PROTON-1385: remove java/jython specific codeblock from proton-c python wrapper
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/21caa13c
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/21caa13c
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/21caa13c
Branch: refs/heads/go1
Commit: 21caa13cc6d67089fba4ce22651abd2ec12d6785
Parents: 71e567d
Author: Robert Gemmell <ro...@apache.org>
Authored: Wed Jan 18 14:44:59 2017 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Wed Jan 18 14:47:00 2017 +0000
----------------------------------------------------------------------
proton-c/bindings/python/proton/wrapper.py | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/21caa13c/proton-c/bindings/python/proton/wrapper.py
----------------------------------------------------------------------
diff --git a/proton-c/bindings/python/proton/wrapper.py b/proton-c/bindings/python/proton/wrapper.py
index eff917b..8519646 100644
--- a/proton-c/bindings/python/proton/wrapper.py
+++ b/proton-c/bindings/python/proton/wrapper.py
@@ -105,10 +105,5 @@ class Wrapper(object):
id(self), addressof(self._impl))
-if pn_py2void(Wrapper) is Wrapper:
- PYCTX = Wrapper
- import java.lang.System
- addressof = java.lang.System.identityHashCode
-else:
- PYCTX = int(pn_py2void(Wrapper))
- addressof = int
+PYCTX = int(pn_py2void(Wrapper))
+addressof = int
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[08/13] qpid-proton git commit: PROTON-1396: restore the so version
to 10 on master for 0.17.0.
Posted by ac...@apache.org.
PROTON-1396: restore the so version to 10 on master for 0.17.0.
Checking (thanks Andrew!) shows no ABI relevant change between 0.16.0 and now.
This reverts commit 2389a2179e39fd53912a3e28369b1b409d94c996 for PROTON-1374
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/99e516b5
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/99e516b5
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/99e516b5
Branch: refs/heads/go1
Commit: 99e516b5c3cc62090f5d69ea4a9af433014541de
Parents: cf30fff
Author: Robert Gemmell <ro...@apache.org>
Authored: Fri Feb 3 10:45:44 2017 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Fri Feb 3 10:45:44 2017 +0000
----------------------------------------------------------------------
proton-c/soversion.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/99e516b5/proton-c/soversion.cmake
----------------------------------------------------------------------
diff --git a/proton-c/soversion.cmake b/proton-c/soversion.cmake
index 665edca..58cc6f5 100644
--- a/proton-c/soversion.cmake
+++ b/proton-c/soversion.cmake
@@ -1,2 +1,2 @@
-set (PN_LIB_SOMAJOR 11)
+set (PN_LIB_SOMAJOR 10)
set (PN_LIB_SOMINOR "0.0")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[04/13] qpid-proton git commit: PROTON-1392: properly export
swig-generated API on SunStudio
Posted by ac...@apache.org.
PROTON-1392: properly export swig-generated API on SunStudio
This closes #94
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/2f4ccd56
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/2f4ccd56
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/2f4ccd56
Branch: refs/heads/go1
Commit: 2f4ccd56941fe5cd7c30c4696dbc60d2e598b13f
Parents: 05451b2
Author: Adel Boutros <Ad...@live.com>
Authored: Wed Jan 18 13:41:10 2017 -0500
Committer: Ken Giusti <kg...@apache.org>
Committed: Mon Jan 30 14:00:39 2017 -0500
----------------------------------------------------------------------
proton-c/bindings/python/CMakeLists.txt | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2f4ccd56/proton-c/bindings/python/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/bindings/python/CMakeLists.txt b/proton-c/bindings/python/CMakeLists.txt
index fe732d9..b112ec9 100644
--- a/proton-c/bindings/python/CMakeLists.txt
+++ b/proton-c/bindings/python/CMakeLists.txt
@@ -29,6 +29,12 @@ set_source_files_properties(cproton.i PROPERTIES CPLUSPLUS NO)
# Suppress warnings in swig generated code.
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
+# Set Compiler extra flags for Solaris when using SunStudio
+if (CMAKE_C_COMPILER_ID STREQUAL "SunPro")
+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSWIGEXPORT=__global")
+endif ()
+
+
list(APPEND SWIG_MODULE_cproton_EXTRA_DEPS
${CMAKE_SOURCE_DIR}/proton-c/include/proton/cproton.i
${PROTON_HEADERS}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[13/13] qpid-proton git commit: NO-JIRA: Merge branch 'master' into
go1 for updates
Posted by ac...@apache.org.
NO-JIRA: Merge branch 'master' into go1 for updates
Example and build fixes.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/ed8e879f
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/ed8e879f
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/ed8e879f
Branch: refs/heads/go1
Commit: ed8e879f6f43a6e5f83e166de80a3800d36ebe07
Parents: 5c4f4d7 6ff92f0
Author: Alan Conway <ac...@redhat.com>
Authored: Tue Feb 7 15:50:44 2017 -0500
Committer: Alan Conway <ac...@redhat.com>
Committed: Tue Feb 7 15:51:40 2017 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[10/13] qpid-proton git commit: PROTON-1396: update version to
0.18.0-SNAPSHOT
Posted by ac...@apache.org.
PROTON-1396: update version to 0.18.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/4185261b
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/4185261b
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/4185261b
Branch: refs/heads/go1
Commit: 4185261b7e43c221a1659d54cf35c871d99cfd9c
Parents: 5445b6a
Author: Robert Gemmell <ro...@apache.org>
Authored: Fri Feb 3 19:20:57 2017 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Fri Feb 3 19:20:57 2017 +0000
----------------------------------------------------------------------
proton-c/bindings/python/docs/conf.py | 4 ++--
version.txt | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/4185261b/proton-c/bindings/python/docs/conf.py
----------------------------------------------------------------------
diff --git a/proton-c/bindings/python/docs/conf.py b/proton-c/bindings/python/docs/conf.py
index 8c8cec3..50966e0 100644
--- a/proton-c/bindings/python/docs/conf.py
+++ b/proton-c/bindings/python/docs/conf.py
@@ -48,9 +48,9 @@ copyright = u'2015, Apache Qpid'
# built documents.
#
# The short X.Y version.
-version = '0.17.0'
+version = '0.18.0'
# The full version, including alpha/beta/rc tags.
-release = '0.17.0'
+release = '0.18.0-SNAPSHOT'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/4185261b/version.txt
----------------------------------------------------------------------
diff --git a/version.txt b/version.txt
index c5523bd..4e57392 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.17.0
+0.18.0-SNAPSHOT
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[12/13] qpid-proton git commit: NO-JIRA: go: send example report
unexpected message outcomes.
Posted by ac...@apache.org.
NO-JIRA: go: send example report unexpected message outcomes.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/6ff92f06
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/6ff92f06
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/6ff92f06
Branch: refs/heads/go1
Commit: 6ff92f06117aae2c80f2e29b603128496a8f6bcc
Parents: 66d8f0e
Author: Alan Conway <ac...@redhat.com>
Authored: Fri Jan 27 17:19:21 2017 -0500
Committer: Alan Conway <ac...@redhat.com>
Committed: Tue Feb 7 15:44:39 2017 -0500
----------------------------------------------------------------------
examples/go/electron/send.go | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/6ff92f06/examples/go/electron/send.go
----------------------------------------------------------------------
diff --git a/examples/go/electron/send.go b/examples/go/electron/send.go
index 2338b23..91cff28 100644
--- a/examples/go/electron/send.go
+++ b/examples/go/electron/send.go
@@ -92,7 +92,9 @@ func main() {
for i := 0; i < expect; i++ {
out := <-sentChan // Outcome of async sends.
if out.Error != nil {
- log.Fatalf("acknowledgement[%v] %v error: %v\n", i, out.Value, out.Error)
+ log.Fatalf("acknowledgement[%v] %v error: %v", i, out.Value, out.Error)
+ } else if out.Status != electron.Accepted {
+ log.Fatalf("acknowledgement[%v] unexpected status: %v", i, out.Status)
} else {
Debugf("acknowledgement[%v] %v (%v)\n", i, out.Value, out.Status)
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[06/13] qpid-proton git commit: PROTON-1395: go: testing with -race
fails on some platforms
Posted by ac...@apache.org.
PROTON-1395: go: testing with -race fails on some platforms
Remove -race from the default GO_TEST_FLAGS as it causes problems on some
platforms. You can enable it in cmake by adding -race to the GO_TEST_FLAGS
value (and are encouraged to if your platform supports it)
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/6a235006
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/6a235006
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/6a235006
Branch: refs/heads/go1
Commit: 6a235006808750454bdeb35a1bd3195a914b5a0d
Parents: e0ec0b6
Author: Alan Conway <ac...@redhat.com>
Authored: Wed Feb 1 14:03:50 2017 -0500
Committer: Alan Conway <ac...@redhat.com>
Committed: Wed Feb 1 14:03:50 2017 -0500
----------------------------------------------------------------------
proton-c/bindings/go/CMakeLists.txt | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/6a235006/proton-c/bindings/go/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/bindings/go/CMakeLists.txt b/proton-c/bindings/go/CMakeLists.txt
index 16c633b..d0ffe9b 100644
--- a/proton-c/bindings/go/CMakeLists.txt
+++ b/proton-c/bindings/go/CMakeLists.txt
@@ -22,14 +22,13 @@ execute_process(COMMAND ${GO_EXE} version OUTPUT_VARIABLE go_ver OUTPUT_STRIP_TR
message(STATUS "Found Go: ${GO_EXE} (${go_ver})")
set(GO_BUILD_FLAGS "" CACHE STRING "Flags for 'go build'")
+set(GO_TEST_FLAGS "-v" CACHE STRING "Flags for 'go test'")
# Flags that differ for golang go and gcc go.
if (go_ver MATCHES "gccgo")
# TODO aconway 2015-10-08: import cycles with -race under gccgo, investigate.
- set(GO_TEST_FLAGS "-v" CACHE STRING "Flags for 'go test'")
set(GO_RPATH_FLAGS -gccgoflags "-Wl,-rpath=${CMAKE_BINARY_DIR}/proton-c")
else()
- set(GO_TEST_FLAGS "-v -race" CACHE STRING "Flags for 'go test'")
set(GO_RPATH_FLAGS -ldflags "-r ${CMAKE_BINARY_DIR}/proton-c")
endif()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[03/13] qpid-proton git commit: PROTON-1383: [C++ binding] Add
#include that seems to be needed by SunPro compiler
Posted by ac...@apache.org.
PROTON-1383: [C++ binding] Add #include that seems to be needed by SunPro compiler
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/05451b27
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/05451b27
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/05451b27
Branch: refs/heads/go1
Commit: 05451b272c390ef5d0f9d2d6fca354b261e19675
Parents: 929f8a5
Author: Andrew Stitcher <as...@apache.org>
Authored: Fri Jan 20 12:58:51 2017 -0500
Committer: Andrew Stitcher <as...@apache.org>
Committed: Fri Jan 20 12:58:51 2017 -0500
----------------------------------------------------------------------
proton-c/bindings/cpp/include/proton/endpoint.hpp | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/05451b27/proton-c/bindings/cpp/include/proton/endpoint.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/endpoint.hpp b/proton-c/bindings/cpp/include/proton/endpoint.hpp
index b041906..d660762 100644
--- a/proton-c/bindings/cpp/include/proton/endpoint.hpp
+++ b/proton-c/bindings/cpp/include/proton/endpoint.hpp
@@ -23,6 +23,7 @@
*/
#include "./fwd.hpp"
+#include "./error_condition.hpp"
#include "./internal/config.hpp"
#include "./internal/export.hpp"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[05/13] qpid-proton git commit: PROTON-1385: remove stale scratch file
Posted by ac...@apache.org.
PROTON-1385: remove stale scratch file
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/e0ec0b61
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/e0ec0b61
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/e0ec0b61
Branch: refs/heads/go1
Commit: e0ec0b61d970a95a21ff7ea53bec5ea3e82bbbab
Parents: 2f4ccd5
Author: Robert Gemmell <ro...@apache.org>
Authored: Tue Jan 31 10:10:31 2017 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Tue Jan 31 10:10:31 2017 +0000
----------------------------------------------------------------------
tests/python/proton_tests/scratch.py | 44 -------------------------------
1 file changed, 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/e0ec0b61/tests/python/proton_tests/scratch.py
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/scratch.py b/tests/python/proton_tests/scratch.py
deleted file mode 100644
index 7e8ae5b..0000000
--- a/tests/python/proton_tests/scratch.py
+++ /dev/null
@@ -1,44 +0,0 @@
- def xxx_test_reopen_on_same_session(self):
- ssn1 = self.snd.session
- ssn2 = self.rcv.session
-
- self.snd.open()
- self.rcv.open()
- self.pump()
-
- assert self.snd.state == Endpoint.LOCAL_ACTIVE | Endpoint.REMOTE_ACTIVE
- assert self.rcv.state == Endpoint.LOCAL_ACTIVE | Endpoint.REMOTE_ACTIVE
-
- self.snd.close()
- self.rcv.close()
- self.pump()
-
- assert self.snd.state == Endpoint.LOCAL_CLOSED | Endpoint.REMOTE_CLOSED
- assert self.rcv.state == Endpoint.LOCAL_CLOSED | Endpoint.REMOTE_CLOSED
-
- print self.snd._link
- self.snd = ssn1.sender("test-link")
- print self.snd._link
- self.rcv = ssn2.receiver("test-link")
- self.snd.open()
- self.rcv.open()
- self.pump()
-
- assert self.snd.state == Endpoint.LOCAL_ACTIVE | Endpoint.REMOTE_ACTIVE
- assert self.rcv.state == Endpoint.LOCAL_ACTIVE | Endpoint.REMOTE_ACTIVE
-
-class SessionPipelineTest(PeerTest):
-
- def xxx_test(self):
- self.connection.open()
- self.peer.open()
- self.pump()
- ssn = self.connection.session()
- ssn.open()
- self.pump()
- peer_ssn = self.peer.session_head(0)
- ssn.close()
- self.pump()
- peer_ssn.close()
- self.peer.close()
- self.pump()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[11/13] qpid-proton git commit: PROTON-1344: Added missed
PN_LISTENER_ACCEPT event from pn_event_type_name()
Posted by ac...@apache.org.
PROTON-1344: Added missed PN_LISTENER_ACCEPT event from pn_event_type_name()
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/66d8f0e9
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/66d8f0e9
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/66d8f0e9
Branch: refs/heads/go1
Commit: 66d8f0e9c493419f27ff63f47dd7a707efc28e80
Parents: 4185261
Author: Andrew Stitcher <as...@apache.org>
Authored: Mon Jan 23 12:30:53 2017 -0500
Committer: Andrew Stitcher <as...@apache.org>
Committed: Fri Feb 3 15:43:06 2017 -0500
----------------------------------------------------------------------
proton-c/src/core/event.c | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/66d8f0e9/proton-c/src/core/event.c
----------------------------------------------------------------------
diff --git a/proton-c/src/core/event.c b/proton-c/src/core/event.c
index 54fdee7..41ff6d1 100644
--- a/proton-c/src/core/event.c
+++ b/proton-c/src/core/event.c
@@ -385,6 +385,8 @@ const char *pn_event_type_name(pn_event_type_t type)
return "PN_SELECTABLE_FINAL";
case PN_CONNECTION_WAKE:
return "PN_CONNECTION_WAKE";
+ case PN_LISTENER_ACCEPT:
+ return "PN_LISTENER_ACCEPT";
case PN_LISTENER_CLOSE:
return "PN_LISTENER_CLOSE";
case PN_PROACTOR_INTERRUPT:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[02/13] qpid-proton git commit: PROTON-1391: Fix passing NULL as a
var_arg not working on Solaris
Posted by ac...@apache.org.
PROTON-1391: Fix passing NULL as a var_arg not working on Solaris
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/929f8a5e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/929f8a5e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/929f8a5e
Branch: refs/heads/go1
Commit: 929f8a5e803b01d46f5753390b0709892f6089a9
Parents: 21caa13
Author: aboutros <ad...@murex.com>
Authored: Wed Jan 18 17:09:27 2017 +0100
Committer: Andrew Stitcher <as...@apache.org>
Committed: Wed Jan 18 19:24:44 2017 -0500
----------------------------------------------------------------------
proton-c/src/sasl/sasl.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/929f8a5e/proton-c/src/sasl/sasl.c
----------------------------------------------------------------------
diff --git a/proton-c/src/sasl/sasl.c b/proton-c/src/sasl/sasl.c
index 12b6ad0..55c489d 100644
--- a/proton-c/src/sasl/sasl.c
+++ b/proton-c/src/sasl/sasl.c
@@ -211,7 +211,8 @@ static void pni_post_sasl_frame(pn_transport_t *transport)
pn_post_frame(transport, SASL_FRAME_TYPE, 0, "DL[B]", SASL_OUTCOME, sasl->outcome);
pni_emit(transport);
if (sasl->outcome!=PN_SASL_OK) {
- pn_do_error(transport, "amqp:unauthorized-access", "Failed to authenticate client [mech=%s]", transport->sasl->selected_mechanism);
+ pn_do_error(transport, "amqp:unauthorized-access", "Failed to authenticate client [mech=%s]",
+ transport->sasl->selected_mechanism ? transport->sasl->selected_mechanism : "none");
desired_state = SASL_ERROR;
}
break;
@@ -222,7 +223,8 @@ static void pni_post_sasl_frame(pn_transport_t *transport)
}
break;
case SASL_RECVED_OUTCOME_FAIL:
- pn_do_error(transport, "amqp:unauthorized-access", "Authentication failed [mech=%s]", transport->sasl->selected_mechanism);
+ pn_do_error(transport, "amqp:unauthorized-access", "Authentication failed [mech=%s]",
+ transport->sasl->selected_mechanism ? transport->sasl->selected_mechanism : "none");
desired_state = SASL_ERROR;
break;
case SASL_ERROR:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[07/13] qpid-proton git commit: NO-JIRA: go: example error handling
fix
Posted by ac...@apache.org.
NO-JIRA: go: example error handling fix
Examples were not reporting errors correctly.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/cf30fff2
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/cf30fff2
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/cf30fff2
Branch: refs/heads/go1
Commit: cf30fff21265f49809874363682f5d15848caad0
Parents: 6a23500
Author: Alan Conway <ac...@redhat.com>
Authored: Fri Jan 27 17:19:21 2017 -0500
Committer: Alan Conway <ac...@redhat.com>
Committed: Wed Feb 1 15:26:10 2017 -0500
----------------------------------------------------------------------
examples/go/electron/receive.go | 42 +++++++++++++++++++-----------------
examples/go/electron/send.go | 36 ++++++++++++++++---------------
2 files changed, 41 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/cf30fff2/examples/go/electron/receive.go
----------------------------------------------------------------------
diff --git a/examples/go/electron/receive.go b/examples/go/electron/receive.go
index 37a8583..e48d53c 100644
--- a/examples/go/electron/receive.go
+++ b/examples/go/electron/receive.go
@@ -70,28 +70,24 @@ func main() {
debugf("Connecting to %s\n", urlStr)
go func(urlStr string) { // Start the goroutine
defer wait.Done() // Notify main() when this goroutine is done.
- var err error
- if url, err := amqp.ParseURL(urlStr); err == nil {
- if c, err := container.Dial("tcp", url.Host); err == nil {
- connections <- c // Save connection so we can Close() when main() ends
- if r, err := c.Receiver(electron.Source(url.Path)); err == nil {
- // Loop receiving messages and sending them to the main() goroutine
- for {
- if rm, err := r.Receive(); err == nil {
- rm.Accept()
- messages <- rm.Message
- } else if err == electron.Closed {
- return
- } else {
- log.Fatal("receive error %v: %v", urlStr, err)
- }
- }
- }
+ url, err := amqp.ParseURL(urlStr)
+ fatalIf(err)
+ c, err := container.Dial("tcp", url.Host)
+ fatalIf(err)
+ connections <- c // Save connection so we can Close() when main() ends
+ r, err := c.Receiver(electron.Source(url.Path))
+ fatalIf(err)
+ // Loop receiving messages and sending them to the main() goroutine
+ for {
+ if rm, err := r.Receive(); err == nil {
+ rm.Accept()
+ messages <- rm.Message
+ } else if err == electron.Closed {
+ return
+ } else {
+ log.Fatal("receive error %v: %v", urlStr, err)
}
}
- if err != nil {
- log.Fatal(err)
- }
}(urlStr)
}
@@ -114,3 +110,9 @@ func main() {
}
wait.Wait() // Wait for all goroutines to finish.
}
+
+func fatalIf(err error) {
+ if err != nil {
+ log.Fatal(err)
+ }
+}
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/cf30fff2/examples/go/electron/send.go
----------------------------------------------------------------------
diff --git a/examples/go/electron/send.go b/examples/go/electron/send.go
index f478f4b..2338b23 100644
--- a/examples/go/electron/send.go
+++ b/examples/go/electron/send.go
@@ -69,23 +69,19 @@ func main() {
Debugf("Connecting to %v\n", urlStr)
go func(urlStr string) {
defer wait.Done() // Notify main() when this goroutine is done.
- var err error
- if url, err := amqp.ParseURL(urlStr); err == nil {
- if c, err := container.Dial("tcp", url.Host); err == nil {
- connections <- c // Save connection so we can Close() when main() ends
- if s, err := c.Sender(electron.Target(url.Path)); err == nil {
- // Loop sending messages.
- for i := int64(0); i < *count; i++ {
- m := amqp.NewMessage()
- body := fmt.Sprintf("%v%v", url.Path, i)
- m.Marshal(body)
- s.SendAsync(m, sentChan, body) // Outcome will be sent to sentChan
- }
- }
- }
- }
- if err != nil {
- log.Fatal(err)
+ url, err := amqp.ParseURL(urlStr)
+ fatalIf(err)
+ c, err := container.Dial("tcp", url.Host)
+ fatalIf(err)
+ connections <- c // Save connection so we can Close() when main() ends
+ s, err := c.Sender(electron.Target(url.Path))
+ fatalIf(err)
+ // Loop sending messages.
+ for i := int64(0); i < *count; i++ {
+ m := amqp.NewMessage()
+ body := fmt.Sprintf("%v%v", url.Path, i)
+ m.Marshal(body)
+ s.SendAsync(m, sentChan, body) // Outcome will be sent to sentChan
}
}(urlStr)
}
@@ -111,3 +107,9 @@ func main() {
}
}
}
+
+func fatalIf(err error) {
+ if err != nil {
+ log.Fatal(err)
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[09/13] qpid-proton git commit: PROTON-1396: update versions to 0.17.0
Posted by ac...@apache.org.
PROTON-1396: update versions to 0.17.0
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/5445b6a2
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/5445b6a2
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/5445b6a2
Branch: refs/heads/go1
Commit: 5445b6a255187cf18be6dffb3fa45d659467c502
Parents: 99e516b
Author: Robert Gemmell <ro...@apache.org>
Authored: Fri Feb 3 17:10:17 2017 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Fri Feb 3 17:10:17 2017 +0000
----------------------------------------------------------------------
proton-c/bindings/python/docs/conf.py | 2 +-
version.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/5445b6a2/proton-c/bindings/python/docs/conf.py
----------------------------------------------------------------------
diff --git a/proton-c/bindings/python/docs/conf.py b/proton-c/bindings/python/docs/conf.py
index cae646c..8c8cec3 100644
--- a/proton-c/bindings/python/docs/conf.py
+++ b/proton-c/bindings/python/docs/conf.py
@@ -50,7 +50,7 @@ copyright = u'2015, Apache Qpid'
# The short X.Y version.
version = '0.17.0'
# The full version, including alpha/beta/rc tags.
-release = '0.17.0-SNAPSHOT'
+release = '0.17.0'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/5445b6a2/version.txt
----------------------------------------------------------------------
diff --git a/version.txt b/version.txt
index 636e47c..c5523bd 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.17.0-SNAPSHOT
+0.17.0
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org