svn commit: r1680679 - in /pig/branches/branch-0.15: CHANGES.txt src/org/apache/pig/data/DataType.java

[daijy]

Author: daijy
Date: Wed May 20 21:11:59 2015
New Revision: 1680679

URL: http://svn.apache.org/r1680679
Log:
PIG-4562: Typo in DataType.toDateTime

Modified:
    pig/branches/branch-0.15/CHANGES.txt
    pig/branches/branch-0.15/src/org/apache/pig/data/DataType.java

Modified: pig/branches/branch-0.15/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/pig/branches/branch-0.15/CHANGES.txt?rev=1680679&r1=1680678&r2=1680679&view=diff
==============================================================================
--- pig/branches/branch-0.15/CHANGES.txt (original)
+++ pig/branches/branch-0.15/CHANGES.txt Wed May 20 21:11:59 2015
@@ -68,6 +68,8 @@ PIG-4333: Split BigData tests into multi
  
 BUG FIXES
 
+PIG-4562: Typo in DataType.toDateTime (daijy)
+
 PIG-4559: Fix several new tez e2e test failures (daijy)
 
 PIG-4506: binstorage fails to write biginteger (ssavvides via daijy)

Modified: pig/branches/branch-0.15/src/org/apache/pig/data/DataType.java
URL: 
http://svn.apache.org/viewvc/pig/branches/branch-0.15/src/org/apache/pig/data/DataType.java?rev=1680679&r1=1680678&r2=1680679&view=diff
==============================================================================
--- pig/branches/branch-0.15/src/org/apache/pig/data/DataType.java (original)
+++ pig/branches/branch-0.15/src/org/apache/pig/data/DataType.java Wed May 20 
21:11:59 2015
@@ -1126,7 +1126,7 @@ public class DataType {
             case UNKNOWN:
             default:
                 int errCode = 1071;
-                String msg = "Cannot convert a " + findTypeName(o) + " to a 
Boolean";
+                String msg = "Cannot convert a " + findTypeName(o) + " to a 
DateTime";
                 throw new ExecException(msg, errCode, PigException.INPUT);
             }
         } catch (ClassCastException cce) {
@@ -1135,11 +1135,11 @@ public class DataType {
             throw ee;
         } catch (NumberFormatException nfe) {
             int errCode = 1074;
-            String msg = "Problem with formatting. Could not convert " + o + " 
to Float.";
+            String msg = "Problem with formatting. Could not convert " + o + " 
to DateTime.";
             throw new ExecException(msg, errCode, PigException.INPUT, nfe);
         } catch (Exception e) {
             int errCode = 2054;
-            String msg = "Internal error. Could not convert " + o + " to 
Float.";
+            String msg = "Internal error. Could not convert " + o + " to 
DateTime.";
             throw new ExecException(msg, errCode, PigException.BUG);
         }
     }