[qpid-interop-test] branch master updated: QPIDIT-139: Added header to other receiver cpp shims
This is an automated email from the ASF dual-hosted git repository. kpvdr pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/qpid-interop-test.git The following commit(s) were added to refs/heads/master by this push: new f106e0f QPIDIT-139: Added header to other receiver cpp shims f106e0f is described below commit f106e0f64ff371aa37a7cebf30415b5976547e44 Author: Kim van der Riet AuthorDate: Mon Jul 13 14:25:16 2020 -0400 QPIDIT-139: Added header to other receiver cpp shims --- shims/qpid-proton-cpp/src/qpidit/jms_hdrs_props_test/Receiver.cpp | 1 + shims/qpid-proton-cpp/src/qpidit/jms_messages_test/Receiver.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/shims/qpid-proton-cpp/src/qpidit/jms_hdrs_props_test/Receiver.cpp b/shims/qpid-proton-cpp/src/qpidit/jms_hdrs_props_test/Receiver.cpp index cb275a6..bcaaede 100644 --- a/shims/qpid-proton-cpp/src/qpidit/jms_hdrs_props_test/Receiver.cpp +++ b/shims/qpid-proton-cpp/src/qpidit/jms_hdrs_props_test/Receiver.cpp @@ -22,6 +22,7 @@ #include "qpidit/jms_hdrs_props_test/Receiver.hpp" #include "qpidit/Base64.hpp" +#include #include #include #include diff --git a/shims/qpid-proton-cpp/src/qpidit/jms_messages_test/Receiver.cpp b/shims/qpid-proton-cpp/src/qpidit/jms_messages_test/Receiver.cpp index 0682225..39de811 100644 --- a/shims/qpid-proton-cpp/src/qpidit/jms_messages_test/Receiver.cpp +++ b/shims/qpid-proton-cpp/src/qpidit/jms_messages_test/Receiver.cpp @@ -22,6 +22,7 @@ #include "qpidit/jms_messages_test/Receiver.hpp" #include "qpidit/Base64.hpp" +#include #include #include #include - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-interop-test] branch master updated: QPIDIT-139: Added header to other sender cpp shims
This is an automated email from the ASF dual-hosted git repository. kpvdr pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/qpid-interop-test.git The following commit(s) were added to refs/heads/master by this push: new 6157dd1 QPIDIT-139: Added header to other sender cpp shims 6157dd1 is described below commit 6157dd13760c3a1dd8f5af07ff1dcb7e96bb424e Author: Kim van der Riet AuthorDate: Mon Jul 13 14:21:31 2020 -0400 QPIDIT-139: Added header to other sender cpp shims --- shims/qpid-proton-cpp/src/qpidit/amqp_types_test/Sender.cpp | 1 + shims/qpid-proton-cpp/src/qpidit/jms_hdrs_props_test/Sender.cpp | 1 + shims/qpid-proton-cpp/src/qpidit/jms_messages_test/Sender.cpp | 1 + 3 files changed, 3 insertions(+) diff --git a/shims/qpid-proton-cpp/src/qpidit/amqp_types_test/Sender.cpp b/shims/qpid-proton-cpp/src/qpidit/amqp_types_test/Sender.cpp index abefb5d..2ff0883 100644 --- a/shims/qpid-proton-cpp/src/qpidit/amqp_types_test/Sender.cpp +++ b/shims/qpid-proton-cpp/src/qpidit/amqp_types_test/Sender.cpp @@ -23,6 +23,7 @@ #include "qpidit/Base64.hpp" #include +#include #include #include #include diff --git a/shims/qpid-proton-cpp/src/qpidit/jms_hdrs_props_test/Sender.cpp b/shims/qpid-proton-cpp/src/qpidit/jms_hdrs_props_test/Sender.cpp index 2ef0d07..92069b3 100644 --- a/shims/qpid-proton-cpp/src/qpidit/jms_hdrs_props_test/Sender.cpp +++ b/shims/qpid-proton-cpp/src/qpidit/jms_hdrs_props_test/Sender.cpp @@ -23,6 +23,7 @@ #include "qpidit/Base64.hpp" #include +#include #include #include #include diff --git a/shims/qpid-proton-cpp/src/qpidit/jms_messages_test/Sender.cpp b/shims/qpid-proton-cpp/src/qpidit/jms_messages_test/Sender.cpp index 5a61be5..d280e94 100644 --- a/shims/qpid-proton-cpp/src/qpidit/jms_messages_test/Sender.cpp +++ b/shims/qpid-proton-cpp/src/qpidit/jms_messages_test/Sender.cpp @@ -23,6 +23,7 @@ #include "qpidit/Base64.hpp" #include +#include #include #include #include - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-interop-test] branch master updated: QPIDIT-139: Added header to amqp_large_content_test sender cpp shim
This is an automated email from the ASF dual-hosted git repository. kpvdr pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/qpid-interop-test.git The following commit(s) were added to refs/heads/master by this push: new 9b2fde3 QPIDIT-139: Added header to amqp_large_content_test sender cpp shim 9b2fde3 is described below commit 9b2fde34007179eb933670c48f2e5728310eaf06 Author: Kim van der Riet AuthorDate: Mon Jul 13 14:17:43 2020 -0400 QPIDIT-139: Added header to amqp_large_content_test sender cpp shim --- shims/qpid-proton-cpp/src/qpidit/amqp_large_content_test/Sender.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/shims/qpid-proton-cpp/src/qpidit/amqp_large_content_test/Sender.cpp b/shims/qpid-proton-cpp/src/qpidit/amqp_large_content_test/Sender.cpp index 3b13493..c68cb2e 100644 --- a/shims/qpid-proton-cpp/src/qpidit/amqp_large_content_test/Sender.cpp +++ b/shims/qpid-proton-cpp/src/qpidit/amqp_large_content_test/Sender.cpp @@ -21,6 +21,7 @@ #include "qpidit/amqp_large_content_test/Sender.hpp" +#include #include #include #include - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-proton] branch master updated: PROTON-2246: Fix merge casualty of pn_netaddr restructure
This is an automated email from the ASF dual-hosted git repository. astitcher pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/qpid-proton.git The following commit(s) were added to refs/heads/master by this push: new edce302 PROTON-2246: Fix merge casualty of pn_netaddr restructure edce302 is described below commit edce3029e0ee6abb629ad835646dd93eb21ebf87 Author: Andrew Stitcher AuthorDate: Mon Jul 13 13:29:47 2020 -0400 PROTON-2246: Fix merge casualty of pn_netaddr restructure --- c/src/proactor/win_iocp.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/c/src/proactor/win_iocp.cpp b/c/src/proactor/win_iocp.cpp index d4af496..764a7c4 100644 --- a/c/src/proactor/win_iocp.cpp +++ b/c/src/proactor/win_iocp.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-cpp] branch master updated: QPID-8453: fix boundary test between map8 and map32 encodings for AMQP 1.0 messages
This is an automated email from the ASF dual-hosted git repository.
cliffjansen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-cpp.git
The following commit(s) were added to refs/heads/master by this push:
new 9be8db5 QPID-8453: fix boundary test between map8 and map32 encodings
for AMQP 1.0 messages
9be8db5 is described below
commit 9be8db506b10584872dd14f8fef5cc8c53118f79
Author: Cliff Jansen
AuthorDate: Mon Jul 13 10:18:14 2020 -0700
QPID-8453: fix boundary test between map8 and map32 encodings for AMQP 1.0
messages
---
src/qpid/amqp/MapEncoder.cpp| 4 +++-
src/qpid/amqp/MapSizeCalculator.cpp | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/qpid/amqp/MapEncoder.cpp b/src/qpid/amqp/MapEncoder.cpp
index cf8ef4e..43e1954 100644
--- a/src/qpid/amqp/MapEncoder.cpp
+++ b/src/qpid/amqp/MapEncoder.cpp
@@ -116,9 +116,11 @@ void MapEncoder::handleString(const CharSequence& key,
const CharSequence& value
void MapEncoder::writeMetaData(size_t size, size_t count, const Descriptor* d)
{
-if (count > 255 || size > 255) {
+
+if (count > 255 || (size+1) > 255) {
writeMap32MetaData((uint32_t) size, (uint32_t) count, d);
} else {
+/* can use more compact format */
writeMap8MetaData((uint8_t) size, (uint8_t) count, d);
}
}
diff --git a/src/qpid/amqp/MapSizeCalculator.cpp
b/src/qpid/amqp/MapSizeCalculator.cpp
index 2da1521..4107df6 100644
--- a/src/qpid/amqp/MapSizeCalculator.cpp
+++ b/src/qpid/amqp/MapSizeCalculator.cpp
@@ -139,7 +139,7 @@ size_t MapSizeCalculator::getTotalSizeRequired(const
Descriptor* d) const
size_t result(size);
if (d) result += d->getSize();
result += 1/*typecode*/;
-if (count * 2 > 255 || size > 255) {
+if (count * 2 > 255 || (size+1) > 255) {
result += 4/*size*/ + 4/*count*/;
} else {
result += 1/*size*/ + 1/*count*/;
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
