svn commit: r1404409 - in /pig/branches/branch-0.10: CHANGES.txt src/org/apache/pig/Main.java

[da...@apache.org]

Author: daijy
Date: Wed Oct 31 23:08:11 2012
New Revision: 1404409

URL: http://svn.apache.org/viewvc?rev=1404409&view=rev
Log:
PIG-2958: Pig tests do not appear to have a logger attached (daijy)

Modified:
    pig/branches/branch-0.10/CHANGES.txt
    pig/branches/branch-0.10/src/org/apache/pig/Main.java

Modified: pig/branches/branch-0.10/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.10/CHANGES.txt?rev=1404409&r1=1404408&r2=1404409&view=diff
==============================================================================
--- pig/branches/branch-0.10/CHANGES.txt (original)
+++ pig/branches/branch-0.10/CHANGES.txt Wed Oct 31 23:08:11 2012
@@ -36,6 +36,8 @@ PIG-2727: PigStorage Source tagging does
 
 BUG FIXES
 
+PIG-2958: Pig tests do not appear to have a logger attached (daijy)
+
 PIG-2942: DevTests, TestLoad has a false failure on Windows (jgordon via daijy)
 
 PIG-2943: DevTests, Refactor Windows checks to use new Util.WINDOWS method for code health (jgordon via dvryaboy)

Modified: pig/branches/branch-0.10/src/org/apache/pig/Main.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.10/src/org/apache/pig/Main.java?rev=1404409&r1=1404408&r2=1404409&view=diff
==============================================================================
--- pig/branches/branch-0.10/src/org/apache/pig/Main.java (original)
+++ pig/branches/branch-0.10/src/org/apache/pig/Main.java Wed Oct 31 23:08:11 2012
@@ -830,11 +830,11 @@ private static String validateLogFile(St
             String scriptFileAbsPath;
             try {
                 scriptFileAbsPath = scriptFile.getCanonicalPath();
+                strippedDownScriptName = getFileFromCanonicalPath(scriptFileAbsPath);
             } catch (IOException ioe) {
                 log.warn("Could not compute canonical path to the script file " + ioe.getMessage());
-                return null;
+                strippedDownScriptName = null;
             }            
-            strippedDownScriptName = getFileFromCanonicalPath(scriptFileAbsPath);
         }
     }