QPID-551 : Patch provided by Aidan Skinner to address problems in info logging when stacktraces are short.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@582266 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 11 insertions, 9 deletions

diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
index f873801dc9..df3b5ed202 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
@@ -514,8 +514,9 @@ public class AMQSession extends Closeable implements Session, QueueSession, Topi
     {
         if (_logger.isInfoEnabled())
         {
+            StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
             _logger.info("Closing session: " + this + ":"
-                         + Arrays.asList(Thread.currentThread().getStackTrace()).subList(3, 6));
+                         + Arrays.asList(stackTrace).subList(3, stackTrace.length - 1));
         }
 
         synchronized (_messageDeliveryLock)
@@ -669,7 +670,7 @@ public class AMQSession extends Closeable implements Session, QueueSession, Topi
                     startDistpatcherIfNecessary(true);
                 }
 
-                _dispatcher.rejectPending(consumer);                
+                _dispatcher.rejectPending(consumer);
             }
             else
             {
diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java b/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
index 4ac77f1374..0da55c9857 100644
--- a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
+++ b/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
@@ -480,15 +480,14 @@ public class BasicMessageConsumer extends Closeable implements MessageConsumer
             {
                 if (_logger.isTraceEnabled())
                 {
+                    StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
                     if (_closedStack != null)
                     {
-                        _logger.trace(_consumerTag + " close():"
-                            + Arrays.asList(Thread.currentThread().getStackTrace()).subList(3, 6));
                         _logger.trace(_consumerTag + " previously:" + _closedStack.toString());
                     }
                     else
                     {
-                        _closedStack = Arrays.asList(Thread.currentThread().getStackTrace()).subList(3, 6);
+                        _closedStack = Arrays.asList(stackTrace).subList(3, stackTrace.length - 1);
                     }
                 }
 
@@ -553,15 +552,16 @@ public class BasicMessageConsumer extends Closeable implements MessageConsumer
 
             if (_logger.isTraceEnabled())
             {
+                StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
                 if (_closedStack != null)
                 {
                     _logger.trace(_consumerTag + " markClosed():"
-                        + Arrays.asList(Thread.currentThread().getStackTrace()).subList(3, 8));
+                        + Arrays.asList(stackTrace).subList(3, stackTrace.length - 1));
                     _logger.trace(_consumerTag + " previously:" + _closedStack.toString());
                 }
                 else
                 {
-                    _closedStack = Arrays.asList(Thread.currentThread().getStackTrace()).subList(3, 8);
+                    _closedStack = Arrays.asList(stackTrace).subList(3, stackTrace.length - 1);
                 }
             }
         }
@@ -758,15 +758,16 @@ public class BasicMessageConsumer extends Closeable implements MessageConsumer
             _closed.set(true);
             if (_logger.isTraceEnabled())
             {
+                StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
                 if (_closedStack != null)
                 {
                     _logger.trace(_consumerTag + " notifyError():"
-                        + Arrays.asList(Thread.currentThread().getStackTrace()).subList(3, 8));
+                        + Arrays.asList(stackTrace).subList(3, stackTrace.length - 1));
                     _logger.trace(_consumerTag + " previously" + _closedStack.toString());
                 }
                 else
                 {
-                    _closedStack = Arrays.asList(Thread.currentThread().getStackTrace()).subList(3, 8);
+                    _closedStack = Arrays.asList(stackTrace).subList(3, stackTrace.length - 1);
                 }
             }
         }