From 84daab53eaa20f30cdf77c174dcc432525771221 Mon Sep 17 00:00:00 2001
From: Tyler Hobbs <tyler@datastax.com>
Date: Tue, 8 Apr 2014 12:25:21 -0500
Subject: [PATCH] Avoid build failure due to ANTLR timeout

Patch by Ben Chan; reviewed by Tyler Hobbs for CASSANDRA-6991
---
 CHANGES.txt | 1 +
 build.xml   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 38a6c3c966..430e02c12b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -47,6 +47,7 @@
  * Avoid costly range calculations for range queries on system keyspaces
    (CASSANDRA-6906)
  * Fix SSTable not released if stream session fails (CASSANDRA-6818)
+ * Avoid build failure due to ANTLR timeout (CASSANDRA-6991)
 Merged from 1.2:
  * Add UNLOGGED, COUNTER options to BATCH documentation (CASSANDRA-6816)
  * add extra SSL cipher suites (CASSANDRA-6613)
diff --git a/build.xml b/build.xml
index a15415b531..e6d77d8f0c 100644
--- a/build.xml
+++ b/build.xml
@@ -229,6 +229,8 @@
             classpath="${build.lib}/antlr-3.2.jar"
             fork="true"
             failonerror="true">
+         <arg value="-Xconversiontimeout" />
+         <arg value="10000" />
          <arg value="${build.src.java}/org/apache/cassandra/cql3/Cql.g" />
          <arg value="-fo" />
          <arg value="${build.src.gen-java}/org/apache/cassandra/cql3/" />