svn commit: r1546592 - /felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/ThreadIOImpl.java

[gnodet]

Author: gnodet
Date: Fri Nov 29 16:05:13 2013
New Revision: 1546592

URL: http://svn.apache.org/r1546592
Log:
[FELIX-4336] Fix unit tests

Modified:
    
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/ThreadIOImpl.java

Modified: 
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/ThreadIOImpl.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/ThreadIOImpl.java?rev=1546592&r1=1546591&r2=1546592&view=diff
==============================================================================
--- 
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/ThreadIOImpl.java
 (original)
+++ 
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/ThreadIOImpl.java
 Fri Nov 29 16:05:13 2013
@@ -116,7 +116,17 @@ public class ThreadIOImpl implements Thr
         assert out != null;
         assert err != null;
         checkIO(); // derek
-        Marker marker = new Marker(in, out, err, current.get());
+        Marker prev = current();
+        if (in == this.in) {
+            in = prev.getIn();
+        }
+        if (out == this.out) {
+            out = prev.getOut();
+        }
+        if (err == this.err) {
+            err = prev.getErr();
+        }
+        Marker marker = new Marker(in, out, err, prev);
         this.current.set(marker);
     }
 }