[hornetq-commits] JBoss hornetq SVN: r8539 - trunk/src/main/org/hornetq/core/server/impl.

[do-not-reply at jboss.org]

Author: ataylor
Date: 2009-12-03 14:50:45 -0500 (Thu, 03 Dec 2009)
New Revision: 8539

Modified:
   trunk/src/main/org/hornetq/core/server/impl/HornetQPacketHandler.java
Log:
tidied exception handling

Modified: trunk/src/main/org/hornetq/core/server/impl/HornetQPacketHandler.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/HornetQPacketHandler.java	2009-12-03 19:19:10 UTC (rev 8538)
+++ trunk/src/main/org/hornetq/core/server/impl/HornetQPacketHandler.java	2009-12-03 19:50:45 UTC (rev 8539)
@@ -130,14 +130,13 @@
       }
       catch (Exception e)
       {
-         log.error("Failed to create session", e);
-
          if (e instanceof HornetQException)
          {
             response = new HornetQExceptionMessage((HornetQException)e);
          }
          else
          {
+            log.error("Failed to create session", e);
             response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR));
          }
       }
@@ -155,14 +154,14 @@
       }
       catch (Exception e)
       {
-         log.error("Failed to reattach session", e);
-
          if (e instanceof HornetQException)
          {
             response = new HornetQExceptionMessage((HornetQException)e);
          }
          else
          {
+            log.error("Failed to reattach session", e);
+
             response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR));
          }
       }
@@ -202,14 +201,13 @@
       }
       catch (Exception e)
       {
-         log.warn(e.getMessage(), e);
-
          if (e instanceof HornetQException)
          {
             response = new HornetQExceptionMessage((HornetQException)e);
          }
          else
          {
+            log.warn(e.getMessage(), e);
             response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR));
          }
       }