[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager ManagerReader.java,1.4,1.5

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

Modified Files:
	ManagerReader.java 
Log Message:
Moved handleDisconnection to finally block

Index: ManagerReader.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/ManagerReader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -p -r1.4 -r1.5
--- ManagerReader.java	1 Mar 2005 19:25:35 -0000	1.4
+++ ManagerReader.java	2 Mar 2005 00:37:03 -0000	1.5
@@ -57,8 +57,8 @@ class ManagerReader extends Thread
     private EventBuilder eventBuilder;
 
     /**
-     * The response builder utility to convert a map of attributes reveived from asterisk to instances
-     * of well known response classes.
+     * The response builder utility to convert a map of attributes reveived from asterisk to
+     * instances of well known response classes.
      */
     private ResponseBuilder responseBuilder;
 
@@ -130,7 +130,7 @@ class ManagerReader extends Thread
                     }
                     continue;
                 }
-                
+
                 // Reponse: Follows indicates that the output starting on the next line until
                 // --END COMMAND-- must be treated as raw output of a command executed by a
                 // CommandAction.
@@ -189,8 +189,6 @@ class ManagerReader extends Thread
                     }
                 }
             }
-
-            connection.handleDisconnection();
         }
         catch (IOException e)
         {
@@ -198,7 +196,7 @@ class ManagerReader extends Thread
         }
         finally
         {
-            log.info("Disconnected, closing reader");
+            log.info("Disconnected, closing reader.");
             try
             {
                 reader.close();
@@ -207,6 +205,9 @@ class ManagerReader extends Thread
             {
                 log.warn("Unable to close reader", ex);
             }
+
+            // cleans resources and reconnects if needed
+            connection.handleDisconnection();
         }
     }