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

[do-not-reply at jboss.org]

Author: ataylor
Date: 2009-12-03 14:19:10 -0500 (Thu, 03 Dec 2009)
New Revision: 8538

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

Modified: trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java	2009-12-03 19:01:40 UTC (rev 8537)
+++ trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java	2009-12-03 19:19:10 UTC (rev 8538)
@@ -549,14 +549,13 @@
       }
       catch (Exception e)
       {
-         log.error("Failed to delete queue", e);
-
          if (e instanceof HornetQException)
          {
             response = new HornetQExceptionMessage((HornetQException)e);
          }
          else
          {
+            log.error("Failed to delete queue", e);
             response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR));
          }
       }
@@ -604,14 +603,14 @@
       }
       catch (Exception e)
       {
-         log.error("Failed to execute queue query", e);
-
          if (e instanceof HornetQException)
          {
             response = new HornetQExceptionMessage((HornetQException)e);
          }
          else
          {
+            log.error("Failed to execute queue query", e);
+
             response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR));
          }
       }
@@ -1552,8 +1551,6 @@
       }
       catch (Exception e)
       {
-         log.error("Failed to send message", e);
-
          if (packet.isRequiresResponse())
          {
             if (e instanceof HornetQException)
@@ -1562,6 +1559,8 @@
             }
             else
             {
+               log.error("Failed to send message", e);
+
                response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR));
             }
          }