You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by th...@apache.org on 2017/05/19 17:12:20 UTC
[06/36] avro git commit: Merge origin/trunk-AVRO-1723 into
trunk-AVRO-1723
Merge origin/trunk-AVRO-1723 into trunk-AVRO-1723
Conflicts:
lang/java/avro/src/main/java/org/apache/avro/io/parsing/Symbol.java
Project: http://git-wip-us.apache.org/repos/asf/avro/repo
Commit: http://git-wip-us.apache.org/repos/asf/avro/commit/3ff1fa8c
Tree: http://git-wip-us.apache.org/repos/asf/avro/tree/3ff1fa8c
Diff: http://git-wip-us.apache.org/repos/asf/avro/diff/3ff1fa8c
Branch: refs/heads/master
Commit: 3ff1fa8cac828bfaabd082cb82d7ea3a3827f02f
Parents: c299da6
Author: Zoltan Farkas <zo...@yahoo.com>
Authored: Thu Mar 17 10:18:02 2016 -0400
Committer: Zoltan Farkas <zo...@yahoo.com>
Committed: Thu Mar 17 10:18:02 2016 -0400
----------------------------------------------------------------------
.../avro/src/main/java/org/apache/avro/io/parsing/Symbol.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/avro/blob/3ff1fa8c/lang/java/avro/src/main/java/org/apache/avro/io/parsing/Symbol.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/main/java/org/apache/avro/io/parsing/Symbol.java b/lang/java/avro/src/main/java/org/apache/avro/io/parsing/Symbol.java
index 11e0737..6fb4ca0 100644
--- a/lang/java/avro/src/main/java/org/apache/avro/io/parsing/Symbol.java
+++ b/lang/java/avro/src/main/java/org/apache/avro/io/parsing/Symbol.java
@@ -131,8 +131,8 @@ public abstract class Symbol {
}
private static class Fixup {
- public Symbol[] symbols;
- public int pos;
+ public final Symbol[] symbols;
+ public final int pos;
public Fixup(Symbol[] symbols, int pos) {
this.symbols = symbols;
@@ -638,4 +638,3 @@ public abstract class Symbol {
public static final Symbol MAP_KEY_MARKER =
new Symbol.Terminal("map-key-marker");
}
-