Fixes copying nested data.

- PROTON-246, PROTON-230
epel9
Darryl L. Pierce 12 years ago
parent b882f01c37
commit aee3d68f03

@ -0,0 +1,36 @@
From 595eefb5154017ec151bb551cf973735488654d2 Mon Sep 17 00:00:00 2001
From: astitcher <astitcher@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 21 Feb 2013 17:33:55 +0000
Subject: [PATCH] PROTON-230, PROTON-246: Copying nested data fails in some
cases
git-svn-id: https://svn.apache.org/repos/asf/qpid/proton/trunk@1448733 13f79535-47bb-0310-9956-ffa450edef68
---
proton-c/src/codec/codec.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/proton-c/src/codec/codec.c b/proton-c/src/codec/codec.c
index ee646ab..843abab 100644
--- a/proton-c/src/codec/codec.c
+++ b/proton-c/src/codec/codec.c
@@ -2949,14 +2949,13 @@ int pn_data_appendn(pn_data_t *data, pn_data_t *src, int limit)
pn_data_exit(data);
pn_data_exit(src);
level--;
+ continue;
}
- if (pn_data_next(src)) {
- break;
- } else {
+ if (!pn_data_next(src)) {
stop = true;
- break;
}
+ break;
}
if (stop) break;
--
1.8.1.2

@ -2,7 +2,7 @@
Name: qpid-proton
Version: 0.3
Release: 3%{?dist}
Release: 4%{?dist}
Summary: A high performance, lightweight messaging library
License: ASL 2.0
@ -22,6 +22,8 @@ BuildRequires: epydoc
# BZ#901526
Patch1: 01-PROTON-202-Fixes-building-proton-on-non-x86-platform.patch
Patch2: 02-PROTON-202-Assigns-a-default-value-to-scanned-in-cod.patch
# PROTON-230, PROTON-246
Patch3: 03-PROTON-230-PROTON-246-Copying-nested-data-fails-in-s.patch
%description
@ -86,6 +88,7 @@ Summary: Documentation for the Python language bindings for Qpid Proton
%patch1 -p2
%patch2 -p2
%patch3 -p2
%build
@ -125,6 +128,10 @@ rm -rf %{buildroot}%{_sysconfdir}/php.d
%changelog
* Thu Feb 21 2013 Darryl L. Pierce <dpierce@redhat.com> - 0.3-4
- Fixes copying nested data.
- PROTON-246, PROTON-230
* Mon Jan 28 2013 Darryl L. Pierce <dpierce@redhat.com> - 0.3-3
- Fixes build failure on non-x86 platforms.
- Resolves: BZ#901526

Loading…
Cancel
Save