svn commit: r647335 - in /incubator/pig/trunk: CHANGES.txt src/org/apache/pig/Main.java

[gates]

Author: gates
Date: Fri Apr 11 15:22:09 2008
New Revision: 647335

URL: http://svn.apache.org/viewvc?rev=647335&view=rev
Log:
PIG-203: Fix bug in parameter substitution code where any pig script over 1k 
caused pig to freeze. 

Modified:
    incubator/pig/trunk/CHANGES.txt
    incubator/pig/trunk/src/org/apache/pig/Main.java

Modified: incubator/pig/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/incubator/pig/trunk/CHANGES.txt?rev=647335&r1=647334&r2=647335&view=diff
==============================================================================
--- incubator/pig/trunk/CHANGES.txt (original)
+++ incubator/pig/trunk/CHANGES.txt Fri Apr 11 15:22:09 2008
@@ -223,3 +223,6 @@
        IndexOutOfBoundsException (kali via gates).
 
        PIG-59: Add a new ILLUSTRATE command (shubhamc via gates).
+
+       PIG-203: Fix bug in parameter substitution code where any pig script 
over
+       1k caused pig to freeze. (kali via gates)

Modified: incubator/pig/trunk/src/org/apache/pig/Main.java
URL: 
http://svn.apache.org/viewvc/incubator/pig/trunk/src/org/apache/pig/Main.java?rev=647335&r1=647334&r2=647335&view=diff
==============================================================================
--- incubator/pig/trunk/src/org/apache/pig/Main.java (original)
+++ incubator/pig/trunk/src/org/apache/pig/Main.java Fri Apr 11 15:22:09 2008
@@ -380,11 +380,10 @@
         return new BufferedReader(new FileReader (scriptFile));
 
     } else {
-        PipedWriter pw = new PipedWriter();
-        PipedReader pr = new PipedReader(pw);
-        psp.genSubstitutedFile (origPigScript, pw,  params.size() > 0 ? 
params.toArray(type1) : null, 
+        StringWriter writer = new StringWriter();
+        psp.genSubstitutedFile (origPigScript, writer,  params.size() > 0 ? 
params.toArray(type1) : null, 
                                 paramFiles.size() > 0 ? 
paramFiles.toArray(type2) : null);
-        return new BufferedReader(pr);
+        return new BufferedReader(new StringReader(writer.toString()));
     }
 }