Repository: avro Updated Branches: refs/heads/master 30408a9c1 -> c37d05e87
AVRO-1879: Make conversions field static. Project: http://git-wip-us.apache.org/repos/asf/avro/repo Commit: http://git-wip-us.apache.org/repos/asf/avro/commit/c37d05e8 Tree: http://git-wip-us.apache.org/repos/asf/avro/tree/c37d05e8 Diff: http://git-wip-us.apache.org/repos/asf/avro/diff/c37d05e8 Branch: refs/heads/master Commit: c37d05e87957d7b46c32c5fadcb569dc9be44117 Parents: 30408a9 Author: Michael Wong <[email protected]> Authored: Mon Jul 11 23:56:23 2016 +0100 Committer: Ryan Blue <[email protected]> Committed: Sun Sep 4 13:56:01 2016 -0700 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../apache/avro/compiler/specific/templates/java/classic/record.vm | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/avro/blob/c37d05e8/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 3e329aa..5fad68e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -22,6 +22,8 @@ Trunk (not yet released) AVRO-1719: C++: Fix tests with Boost >= 1.59. (Romain Geissler via blue) + AVRO-1879: Make conversions field static. (Michael Wong via blue) + BUG FIXES AVRO-1741: Python3: Fix error when codec is not in the header. http://git-wip-us.apache.org/repos/asf/avro/blob/c37d05e8/lang/java/compiler/src/main/velocity/org/apache/avro/compiler/specific/templates/java/classic/record.vm ---------------------------------------------------------------------- diff --git a/lang/java/compiler/src/main/velocity/org/apache/avro/compiler/specific/templates/java/classic/record.vm b/lang/java/compiler/src/main/velocity/org/apache/avro/compiler/specific/templates/java/classic/record.vm index 1f99f38..1170d79 100644 --- a/lang/java/compiler/src/main/velocity/org/apache/avro/compiler/specific/templates/java/classic/record.vm +++ b/lang/java/compiler/src/main/velocity/org/apache/avro/compiler/specific/templates/java/classic/record.vm @@ -138,7 +138,7 @@ public class ${this.mangle($schema.getName())}#if ($schema.isError()) extends or protected static final org.apache.avro.data.TimeConversions.TimestampConversion TIMESTAMP_CONVERSION = new org.apache.avro.data.TimeConversions.TimestampConversion(); protected static final org.apache.avro.Conversions.DecimalConversion DECIMAL_CONVERSION = new org.apache.avro.Conversions.DecimalConversion(); - private final org.apache.avro.Conversion<?>[] conversions = + private static final org.apache.avro.Conversion<?>[] conversions = new org.apache.avro.Conversion<?>[] { #foreach ($field in $schema.getFields()) ${this.conversionInstance($field.schema())},
