asterisk-java-cvs

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/io
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21382/src/java/net/sf/asterisk/io

Modified Files:
	SocketConnectionFacadeImpl.java 
Log Message:
Added socketTimeout property to DefaultManagerConnection
Changed SocketFacadeImpl to support explicit connection timeouts [#AJ-16]

Index: SocketConnectionFacadeImpl.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/io/SocketConnectionFacadeImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- SocketConnectionFacadeImpl.java	27 Sep 2005 21:07:26 -0000	1.3
+++ SocketConnectionFacadeImpl.java	6 Oct 2005 11:06:10 -0000	1.4
@@ -24,6 +24,7 @@ import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.net.InetAddress;
+import java.net.InetSocketAddress;
 import java.net.Socket;
 
 /**
@@ -40,19 +41,28 @@ public class SocketConnectionFacadeImpl 
 
     public SocketConnectionFacadeImpl(String host, int port) throws IOException
     {
-        this(new Socket(host, port));
+    	this(host, port, 0);
+    }    
+    
+    public SocketConnectionFacadeImpl(String host, int port, int timeout) throws IOException
+    {
+    	this.socket = new Socket();
+    	this.socket.connect(new InetSocketAddress(host, port), timeout);
+
+        InputStream inputStream = socket.getInputStream();
+        OutputStream outputStream = socket.getOutputStream();
+
+        this.reader = new BufferedReader(new InputStreamReader(inputStream));
+        this.writer = new BufferedWriter(new OutputStreamWriter(outputStream));
     }
 
     SocketConnectionFacadeImpl(Socket socket) throws IOException
     {
-        InputStream inputStream;
-        OutputStream outputStream;
-
-        inputStream = socket.getInputStream();
-        outputStream = socket.getOutputStream();
-
         this.socket = socket;
 
+        InputStream inputStream = socket.getInputStream();
+        OutputStream outputStream = socket.getOutputStream();
+
         this.reader = new BufferedReader(new InputStreamReader(inputStream));
         this.writer = new BufferedWriter(new OutputStreamWriter(outputStream));
     }