Fix for rhbz#1507518
This commit is contained in:
parent
8948eb896e
commit
123a89d00c
|
@ -0,0 +1,27 @@
|
||||||
|
diff --git a/compiler/cpp/src/thrift/generate/t_java_generator.cc b/compiler/cpp/src/thrift/generate/t_java_generator.cc
|
||||||
|
index fb581e4..90dfa06 100644
|
||||||
|
--- a/compiler/cpp/src/thrift/generate/t_java_generator.cc
|
||||||
|
+++ b/compiler/cpp/src/thrift/generate/t_java_generator.cc
|
||||||
|
@@ -4657,8 +4657,9 @@ void t_java_generator::generate_deep_copy_non_container(ofstream& out,
|
||||||
|
std::string dest_name,
|
||||||
|
t_type* type) {
|
||||||
|
(void)dest_name;
|
||||||
|
+ type = get_true_type(type);
|
||||||
|
if (type->is_base_type() || type->is_enum() || type->is_typedef()) {
|
||||||
|
- if (((t_base_type*)type)->is_binary()) {
|
||||||
|
+ if (type->is_binary()) {
|
||||||
|
out << "org.apache.thrift.TBaseHelper.copyBinary(" << source_name << ")";
|
||||||
|
} else {
|
||||||
|
// everything else can be copied directly
|
||||||
|
diff --git a/compiler/cpp/src/thrift/parse/t_type.h b/compiler/cpp/src/thrift/parse/t_type.h
|
||||||
|
index 30f8c1f7..3a6d1e04 100644
|
||||||
|
--- a/compiler/cpp/src/thrift/parse/t_type.h
|
||||||
|
+++ b/compiler/cpp/src/thrift/parse/t_type.h
|
||||||
|
@@ -47,6 +47,7 @@ public:
|
||||||
|
virtual bool is_void() const { return false; }
|
||||||
|
virtual bool is_base_type() const { return false; }
|
||||||
|
virtual bool is_string() const { return false; }
|
||||||
|
+ virtual bool is_binary() const { return false; }
|
||||||
|
virtual bool is_bool() const { return false; }
|
||||||
|
virtual bool is_typedef() const { return false; }
|
||||||
|
virtual bool is_enum() const { return false; }
|
|
@ -50,7 +50,7 @@
|
||||||
|
|
||||||
Name: thrift
|
Name: thrift
|
||||||
Version: 0.10.0
|
Version: 0.10.0
|
||||||
Release: 3%{?dist}
|
Release: 8%{?dist}
|
||||||
Summary: Software framework for cross-language services development
|
Summary: Software framework for cross-language services development
|
||||||
|
|
||||||
# Parts of the source are used under the BSD and zlib licenses, but
|
# Parts of the source are used under the BSD and zlib licenses, but
|
||||||
|
@ -78,6 +78,8 @@ Patch1: fb303-%{version}-buildxml.patch
|
||||||
Patch2: configure-java-prefix.patch
|
Patch2: configure-java-prefix.patch
|
||||||
# fix for ppc64le builds not linking to /usr/lib64 directory
|
# fix for ppc64le builds not linking to /usr/lib64 directory
|
||||||
Patch3: fix-ppc64le-builds.patch
|
Patch3: fix-ppc64le-builds.patch
|
||||||
|
# fix for s390x build; incorporates fix for THRIFT-4177 with some code from THRIFT-4136
|
||||||
|
Patch4: THRIFT-4177.patch
|
||||||
|
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
|
|
||||||
|
@ -521,6 +523,9 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r
|
||||||
%doc LICENSE NOTICE
|
%doc LICENSE NOTICE
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Dec 22 2017 Christopher Tubbs <ctubbsii@fedoraproject.org> - 0.10.0-8
|
||||||
|
- Fix for rhbz#1507518
|
||||||
|
|
||||||
* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.0-3
|
* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.0-3
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue