svn commit: r1693996 - in /pig/trunk: CHANGES.txt src/org/apache/pig/backend/hadoop/executionengine/Launcher.java src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMergeCogroup.java

[daijy]

Author: daijy
Date: Tue Aug  4 05:35:28 2015
New Revision: 1693996

URL: http://svn.apache.org/r1693996
Log:
PIG-4636: Occurred spelled incorrectly in error message for Launcher and 
POMergeCogroup

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/Launcher.java
    
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMergeCogroup.java

Modified: pig/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1693996&r1=1693995&r2=1693996&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Tue Aug  4 05:35:28 2015
@@ -32,6 +32,8 @@ PIG-4570: Allow AvroStorage to use a cla
 
 BUG FIXES
 
+PIG-4636: Occurred spelled incorrectly in error message for Launcher and 
POMergeCogroup (stevenmz via daijy)
+
 PIG-4624: Error on ORC empty file without schema (daijy)
 
 PIG-3622: Allow casting bytearray fields to bytearray type (redisliu via daijy)

Modified: 
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/Launcher.java
URL: 
http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/Launcher.java?rev=1693996&r1=1693995&r2=1693996&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/Launcher.java 
(original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/Launcher.java 
Tue Aug  4 05:35:28 2015
@@ -288,7 +288,7 @@ public abstract class Launcher {
         try {
             jobControlException = 
getExceptionFromString(jobControlExceptionStackTrace);
         } catch (Exception e) {
-            String errMsg = "Could not resolve error that occured when 
launching job: "
+            String errMsg = "Could not resolve error that occurred when 
launching job: "
                     + jobControlExceptionStackTrace;
             jobControlException = new RuntimeException(errMsg, throwable);
         }

Modified: 
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMergeCogroup.java
URL: 
http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMergeCogroup.java?rev=1693996&r1=1693995&r2=1693996&view=diff
==============================================================================
--- 
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMergeCogroup.java
 (original)
+++ 
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/physicalLayer/relationalOperators/POMergeCogroup.java
 Tue Aug  4 05:35:28 2015
@@ -581,7 +581,7 @@ public class POMergeCogroup extends Phys
                 } catch (ExecException e) {
 
                     // Alas, no choice but to throw Runtime exception.
-                    String errMsg = "Exception occured in compare() of heap in 
POMergeCogroup.";
+                    String errMsg = "Exception occurred in compare() of heap 
in POMergeCogroup.";
                     throw new RuntimeException(errMsg,e);
                 }
             }