--- a/NonPositionableExternalStream.st	Tue Feb 05 23:12:47 2013 +0100
+++ b/NonPositionableExternalStream.st	Wed Feb 06 15:47:34 2013 +0100
@@ -512,6 +512,17 @@
 
 !NonPositionableExternalStream methodsFor:'reading'!
 
+next
+    "return the next element, if available.
+     If nothing is available, this does never raise a read-beyond end signal.
+     Instead, nil is returned immediately.
+
+     Redefined, to wait on pipes and sockets"
+
+    self readWait.
+    ^ super next
+!
+
 nextOrNil
     "like #next, this returns the next element, if available.
      If nothing is available, this does never raise a read-beyond end signal.
@@ -520,7 +531,14 @@
      Redefined, to wait on pipes and sockets"
 
     self atEnd ifTrue:[^ nil].
-    ^ self next
+    ^ super nextOrNil
+!
+
+peek
+    "Redefined, to wait on pipes and sockets"
+
+    self readWait.
+    ^ super peek
 !
 
 peekOrNil
@@ -560,9 +578,10 @@
 !NonPositionableExternalStream class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/NonPositionableExternalStream.st,v 1.61 2010-03-04 15:11:43 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/NonPositionableExternalStream.st,v 1.62 2013-02-06 14:47:34 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/NonPositionableExternalStream.st,v 1.61 2010-03-04 15:11:43 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/NonPositionableExternalStream.st,v 1.62 2013-02-06 14:47:34 stefan Exp $'
 ! !
+