[Jnode-svn-commits] SF.net SVN: jnode:[5110] trunk/shell/src

[<cr...@us...>]

Revision: 5110
          http://jnode.svn.sourceforge.net/jnode/?rev=5110&view=rev
Author:   crawley
Date:     2009-03-16 14:17:28 +0000 (Mon, 16 Mar 2009)

Log Message:
-----------
Fix for bug that caused bjorne to try to open '>' files twice.

Modified Paths:
--------------
    trunk/shell/src/shell/org/jnode/shell/bjorne/BjornePipeline.java
    trunk/shell/src/test/org/jnode/test/shell/bjorne/bjorne-shell-tests.xml

Modified: trunk/shell/src/shell/org/jnode/shell/bjorne/BjornePipeline.java
===================================================================
--- trunk/shell/src/shell/org/jnode/shell/bjorne/BjornePipeline.java	2009-03-15 14:34:32 UTC (rev 5109)
+++ trunk/shell/src/shell/org/jnode/shell/bjorne/BjornePipeline.java	2009-03-16 14:17:28 UTC (rev 5110)
@@ -86,18 +86,10 @@
     }
 
     void wire() throws ShellException {
-        evaluateRedirections();
         createPipes();
         activatePipes();
     }
 
-    private void evaluateRedirections() throws ShellException {
-        for (PipelineStage stage : stages) {
-            RedirectionNode[] redirects = stage.command.getRedirects();
-            stage.context.evaluateRedirections(redirects, stage.holders);
-        }
-    }
-
     private void createPipes() throws ShellFailureException {
         try {
             for (PipelineStage stage : stages) {

Modified: trunk/shell/src/test/org/jnode/test/shell/bjorne/bjorne-shell-tests.xml
===================================================================
--- trunk/shell/src/test/org/jnode/test/shell/bjorne/bjorne-shell-tests.xml	2009-03-15 14:34:32 UTC (rev 5109)
+++ trunk/shell/src/test/org/jnode/test/shell/bjorne/bjorne-shell-tests.xml	2009-03-16 14:17:28 UTC (rev 5110)
@@ -703,5 +703,13 @@
 Hi mum again
 </file>
     </testSpec>
+    <testSpec title="subshell 4" command="test" runMode="AS_SCRIPT" rc="0">
+        <script>#!bjorne
+                ( echo Hi mum ; echo Hi mum again ) | cat &gt; @TEMP_DIR@/1
+        </script>
+        <file name="1" input="false">Hi mum
+Hi mum again
+</file>
+    </testSpec>
     
 </testSet>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.