[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager DefaultManagerConnection.java,1.25,1.26

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

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

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

Index: DefaultManagerConnection.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/DefaultManagerConnection.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -p -r1.25 -r1.26
--- DefaultManagerConnection.java	7 Aug 2005 00:09:42 -0000	1.25
+++ DefaultManagerConnection.java	6 Oct 2005 11:06:10 -0000	1.26
@@ -95,6 +95,11 @@ public class DefaultManagerConnection im
      * EventGeneratingAction.
      */
     private long defaultEventTimeout = 5000;
+    
+    /**
+     * The timeout to use when connecting the the Asterisk server.
+     */
+    private int socketTimeout = 0;
 
     /**
      * The time the calling thread is sleeping between checking if a reponse or
@@ -293,6 +298,19 @@ public class DefaultManagerConnection im
     }
 
     /**
+     * The timeout to use when connecting the the Asterisk server.<br>
+     * Default is 0, that is using Java's built-in default.
+     * 
+     * @param socketTimeout the timeout value to be used in milliseconds.
+     * @see java.net.Socket#connect(java.net.SocketAddress, int)
+     * @since 0.2
+     */
+    public void setSocketTimeout(int socketTimeout)
+    {
+    	this.socketTimeout = socketTimeout;
+    }
+    
+    /**
      * Sets the time in milliseconds the synchronous methods
      * {@link #sendAction(ManagerAction)} and
      * {@link #sendAction(ManagerAction, long)} will sleep between two checks
@@ -482,7 +500,7 @@ public class DefaultManagerConnection im
     protected SocketConnectionFacade createSocket() throws IOException
     {
         return new SocketConnectionFacadeImpl(asteriskServer.getHostname(),
-                asteriskServer.getPort());
+                asteriskServer.getPort(), socketTimeout);
     }
 
     /**