From 8a0af228d8942fbf57e4ed0d3c7cdd39783025a8 Mon Sep 17 00:00:00 2001
From: Terence Parr <parrt@antlr.org>
Date: Fri, 3 Aug 2012 18:27:57 -0700
Subject: [PATCH] Revert "fix null ptr"
This reverts commit 95f5d858cbb7a8215a2931fd8a17c8bc02008998.
---
.../src/org/antlr/v4/runtime/atn/ParserATNSimulator.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/runtime/Java/src/org/antlr/v4/runtime/atn/ParserATNSimulator.java b/runtime/Java/src/org/antlr/v4/runtime/atn/ParserATNSimulator.java
index 702b7784d..25380421b 100755
--- a/runtime/Java/src/org/antlr/v4/runtime/atn/ParserATNSimulator.java
+++ b/runtime/Java/src/org/antlr/v4/runtime/atn/ParserATNSimulator.java
@@ -688,10 +688,8 @@ public class ParserATNSimulator<Symbol extends Token> extends ATNSimulator {
// pairs if preds found for conflicting alts
IntervalSet altsToCollectPredsFrom = getConflictingAltsOrUniqueAlt(D.configs);
SemanticContext[] altToPred = getPredsForAmbigAlts(altsToCollectPredsFrom, D.configs, nalts);
- if ( altToPred!=null ) {
- D.predicates = getPredicatePredictions(altsToCollectPredsFrom, altToPred);
- D.prediction = ATN.INVALID_ALT_NUMBER; // make sure we use preds
- }
+ D.predicates = getPredicatePredictions(altsToCollectPredsFrom, altToPred);
+ D.prediction = ATN.INVALID_ALT_NUMBER; // make sure we use preds
if ( D.predicates!=null ) {
int stopIndex = input.index();