From dfd39f1b19fd8d87e09ac4b8a60735d3cd558c3d Mon Sep 17 00:00:00 2001
From: HD Moore <hd_moore@rapid7.com>
Date: Fri, 16 Sep 2005 07:50:04 +0000
Subject: [PATCH] Moved exception back to calling function

git-svn-id: file:///home/svn/incoming/trunk@2854 4d416f70-5f16-0410-b530-b9f4589650da
---
 lib/rex/io/stream.rb | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/lib/rex/io/stream.rb b/lib/rex/io/stream.rb
index ef9494e6af..964b7623fc 100644
--- a/lib/rex/io/stream.rb
+++ b/lib/rex/io/stream.rb
@@ -112,12 +112,9 @@ module Stream
 	#
 	def timed_write(buf, wait = def_write_timeout, opts = {})
 		if (wait and wait > 0)
-			begin
-				timeout(wait) {
-					return write(buf, opts)
-				}
-			rescue Timeout::Error
-			end
+			timeout(wait) {
+				return write(buf, opts)
+			}
 		else
 			return write(buf, opts)
 		end
@@ -128,12 +125,9 @@ module Stream
 	#
 	def timed_read(length = nil, wait = def_read_timeout, opts = {})
 		if (wait and wait > 0)
-			begin
-				timeout(wait) {
-					return read(length, opts)
-				}
-			rescue Timeout::Error
-			end
+			timeout(wait) {
+				return read(length, opts)
+			}
 		else
 			return read(length, opts)
 		end