You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by rd...@apache.org on 2011/05/07 00:52:21 UTC

svn commit: r1100411 - in /pig/trunk: CHANGES.txt src/org/apache/pig/impl/util/LogUtils.java

Author: rding
Date: Fri May  6 22:52:21 2011
New Revision: 1100411

URL: http://svn.apache.org/viewvc?rev=1100411&view=rev
Log:
PIG-2049: Pig should display TokenMgrError message consistently across all parsers

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/src/org/apache/pig/impl/util/LogUtils.java

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1100411&r1=1100410&r2=1100411&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Fri May  6 22:52:21 2011
@@ -202,6 +202,8 @@ PIG-1696: Performance: Use System.arrayc
 
 BUG FIXES
 
+PIG-2049: Pig should display TokenMgrError message consistently across all parsers (rding)
+
 PIG-2041: Minicluster should make each run independent (daijy)
 
 PIG-2040: Move classloader from QueryParserDriver to PigContext (daijy)

Modified: pig/trunk/src/org/apache/pig/impl/util/LogUtils.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/impl/util/LogUtils.java?rev=1100411&r1=1100410&r2=1100411&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/impl/util/LogUtils.java (original)
+++ pig/trunk/src/org/apache/pig/impl/util/LogUtils.java Fri May  6 22:52:21 2011
@@ -106,7 +106,8 @@ public class LogUtils {
         } else {
             if((t instanceof ParseException 
                     || t instanceof org.apache.pig.tools.pigscript.parser.TokenMgrError 
-                    || t instanceof org.apache.pig.impl.logicalLayer.parser.TokenMgrError)) {
+                    || t instanceof org.apache.pig.impl.logicalLayer.parser.TokenMgrError
+                    || t instanceof org.apache.pig.tools.parameters.TokenMgrError)) {
                 message = "ERROR 1000: Error during parsing. " + t.getMessage();
             } else if (t instanceof IOException) {
                 message = "ERROR 2997: Encountered IOException. " + t.getMessage();