tidied exception handling

hornetq · Dec 3, 2009 · 60da95b · 60da95b
1 parent 653212d
commit 60da95b
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java b/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java
@@ -549,14 +549,13 @@ public void handleDeleteQueue(final SessionDeleteQueueMessage packet)
       }
       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 @@ else if (name.equals(managementAddress))
       }
       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 @@ public void handleSendContinuations(final SessionSendContinuationMessage packet)
       }
       catch (Exception e)
       {
-         log.error("Failed to send message", e);
-
          if (packet.isRequiresResponse())
          {
             if (e instanceof HornetQException)
@@ -1562,6 +1559,8 @@ public void handleSendContinuations(final SessionSendContinuationMessage packet)
             }
             else
             {
+               log.error("Failed to send message", e);
+
                response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR));
             }
          }