[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager DefaultAsteriskManager.java,1.13,1.14

[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-serv28259/src/java/net/sf/asterisk/manager

Modified Files:
	DefaultAsteriskManager.java 
Log Message:
Changed skipQueues to be an attribute rather than a parameter to initialize to work when reconnecting as well

Index: DefaultAsteriskManager.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/DefaultAsteriskManager.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -p -r1.13 -r1.14
--- DefaultAsteriskManager.java	28 Jul 2005 00:10:12 -0000	1.13
+++ DefaultAsteriskManager.java	28 Jul 2005 23:05:21 -0000	1.14
@@ -98,6 +98,12 @@ public class DefaultAsteriskManager
     private Map versions;
 
     /**
+     * Flag to skip initializing queues as that results in a timeout on Asterisk
+     * 1.0.x.
+     */
+    private boolean skipQueues;
+
+    /**
      * Creates a new instance.
      */
     public DefaultAsteriskManager()
@@ -117,6 +123,11 @@ public class DefaultAsteriskManager
         this.connection = connection;
     }
 
+    public void setSkipQueues(boolean skipQueues)
+    {
+        this.skipQueues = skipQueues;
+    }
+
     public void setManagerConnection(ManagerConnection connection)
     {
         this.connection = connection;
@@ -125,19 +136,10 @@ public class DefaultAsteriskManager
     public void initialize() throws TimeoutException, IOException,
             AuthenticationFailedException
     {
-        initialize(false);
-    }
-
-    public void initialize(boolean skipQueues) throws TimeoutException,
-            IOException, AuthenticationFailedException
-    {
         connection.login();
 
         initializeChannels();
-        if (!skipQueues)
-        {
-            initializeQueues();
-        }
+        initializeQueues();
 
         connection.addEventHandler(this);
     }
@@ -166,6 +168,11 @@ public class DefaultAsteriskManager
         ResponseEvents re;
         Iterator i;
 
+        if (skipQueues)
+        {
+            return;
+        }
+
         try
         {
             re = connection.sendEventGeneratingAction(new QueueStatusAction());