asterisk-java-cvs

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

Modified Files:
	DefaultManagerConnection.java 
Log Message:
Added more unit tests for DefaultManagerConnection

Index: DefaultManagerConnection.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/DefaultManagerConnection.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -p -r1.5 -r1.6
--- DefaultManagerConnection.java	4 Mar 2005 22:21:04 -0000	1.5
+++ DefaultManagerConnection.java	5 Mar 2005 00:14:32 -0000	1.6
@@ -59,8 +59,8 @@ public class DefaultManagerConnection im
 
     /* Config attributes */
     private AsteriskServer asteriskServer;
-    private String username;
-    private String password;
+    protected String username;
+    protected String password;
     private long defaultTimeout = 2000;
     private long sleepTime = 50;
     private boolean keepAliveAfterAuthenticationFailure = false;
@@ -81,7 +81,7 @@ public class DefaultManagerConnection im
     private String protocolIdentifier;
     private final Map responseHandlers;
     private final Collection eventHandlers;
-    private boolean keepAlive = false;
+    protected boolean keepAlive = false;
 
     public DefaultManagerConnection()
     {
@@ -273,8 +273,14 @@ public class DefaultManagerConnection im
         try
         {
             MessageDigest md = MessageDigest.getInstance("MD5");
-            md.update(challenge.getBytes());
-            md.update(password.getBytes());
+            if (challenge != null)
+            {
+                md.update(challenge.getBytes());
+            }
+            if (password != null)
+            {
+                md.update(password.getBytes());
+            }
             loginAction.setKey(Util.toHexString(md.digest()));
         }
         catch (NoSuchAlgorithmException ex)
@@ -305,7 +311,7 @@ public class DefaultManagerConnection im
         {
             this.reader = createReader(this, asteriskServer);
         }
-        
+
         if (this.writer == null)
         {
             this.writer = createWriter();
@@ -583,16 +589,13 @@ public class DefaultManagerConnection im
                 ManagerEventHandler eventHandler;
 
                 eventHandler = (ManagerEventHandler) i.next();
-                if (eventHandler != null)
+                try
                 {
-                    try
-                    {
-                        eventHandler.handleEvent(event);
-                    }
-                    catch (Exception e)
-                    {
-                        logger.warn("Exception calling eventHandler", e);
-                    }
+                    eventHandler.handleEvent(event);
+                }
+                catch (Exception e)
+                {
+                    logger.warn("Exception calling eventHandler", e);
                 }
             }
         }
@@ -685,7 +688,7 @@ public class DefaultManagerConnection im
                     }
                     else
                     {
-                        logger.error("Unable to log in after reconnect. Giving up.", e1);
+                        logger.error("Unable to log in after reconnect. Giving up.");
                         this.keepAlive = false;
                     }
                 }