Repository: sqoop Updated Branches: refs/heads/trunk e1d046891 -> dcd5d843c
SQOOP-1437: 'Text' reserved word in compliation (Nick White via Jarek Jarcec Cecho) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/dcd5d843 Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/dcd5d843 Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/dcd5d843 Branch: refs/heads/trunk Commit: dcd5d843c2f866035e4246eb6c593b37685bfda0 Parents: e1d0468 Author: Jarek Jarcec Cecho <[email protected]> Authored: Mon Oct 6 18:04:25 2014 -0700 Committer: Jarek Jarcec Cecho <[email protected]> Committed: Mon Oct 6 18:04:25 2014 -0700 ---------------------------------------------------------------------- src/java/org/apache/sqoop/orm/ClassWriter.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/dcd5d843/src/java/org/apache/sqoop/orm/ClassWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/sqoop/orm/ClassWriter.java b/src/java/org/apache/sqoop/orm/ClassWriter.java index 94ff576..1c6f7f4 100644 --- a/src/java/org/apache/sqoop/orm/ClassWriter.java +++ b/src/java/org/apache/sqoop/orm/ClassWriter.java @@ -116,6 +116,10 @@ public class ClassWriter { JAVA_RESERVED_WORDS.add("void"); JAVA_RESERVED_WORDS.add("volatile"); JAVA_RESERVED_WORDS.add("while"); + + // not strictly reserved words, but collides with + // our imports + JAVA_RESERVED_WORDS.add("Text"); } public static final String PROPERTY_CODEGEN_METHODS_MAXCOLS =
