You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by da...@apache.org on 2014/11/01 18:44:45 UTC

svn commit: r1635997 - in /pig/branches/branch-0.14: CHANGES.txt src/org/apache/pig/scripting/jython/JythonScriptEngine.java

Author: daijy
Date: Sat Nov  1 17:44:45 2014
New Revision: 1635997

URL: http://svn.apache.org/r1635997
Log:
PIG-4182: e2e tests Scripting_[1-12] fail on Windows

Modified:
    pig/branches/branch-0.14/CHANGES.txt
    pig/branches/branch-0.14/src/org/apache/pig/scripting/jython/JythonScriptEngine.java

Modified: pig/branches/branch-0.14/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.14/CHANGES.txt?rev=1635997&r1=1635996&r2=1635997&view=diff
==============================================================================
--- pig/branches/branch-0.14/CHANGES.txt (original)
+++ pig/branches/branch-0.14/CHANGES.txt Sat Nov  1 17:44:45 2014
@@ -97,6 +97,8 @@ OPTIMIZATIONS
  
 BUG FIXES
 
+PIG-4182: e2e tests Scripting_[1-12] fail on Windows (daijy)
+
 PIG-4259: Fix few issues related to Union, CROSS and auto parallelism in Tez (rohini)
 
 PIG-4250: Fix Security Risks found by Coverity (daijy)

Modified: pig/branches/branch-0.14/src/org/apache/pig/scripting/jython/JythonScriptEngine.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.14/src/org/apache/pig/scripting/jython/JythonScriptEngine.java?rev=1635997&r1=1635996&r2=1635997&view=diff
==============================================================================
--- pig/branches/branch-0.14/src/org/apache/pig/scripting/jython/JythonScriptEngine.java (original)
+++ pig/branches/branch-0.14/src/org/apache/pig/scripting/jython/JythonScriptEngine.java Sat Nov  1 17:44:45 2014
@@ -300,7 +300,7 @@ public class JythonScriptEngine extends 
                                 // determine the relative path that the file should have in the jar
                                 int pos = apath.lastIndexOf(File.separatorChar + name.replace('.', File.separatorChar));
                                 if (pos > 0) {
-                                    files.put(apath.substring(pos), apath);
+                                    files.put(apath.substring(pos + 1), apath);
                                 } else {
                                     files.put(apath, apath);
                                 }