svn commit: r582266 - in /incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client: AMQSession.java BasicMessageConsumer.java

[ritchiem]

Author: ritchiem
Date: Fri Oct  5 06:39:25 2007
New Revision: 582266

URL: http://svn.apache.org/viewvc?rev=582266&view=rev
Log:
QPID-551 : Patch provided by Aidan Skinner to address problems in info logging 
when stacktraces are short.

Modified:
    
incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
    
incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java

Modified: 
incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/AMQSession.java?rev=582266&r1=582265&r2=582266&view=diff
==============================================================================
--- 
incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
 (original)
+++ 
incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
 Fri Oct  5 06:39:25 2007
@@ -514,8 +514,9 @@
     {
         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 @@
                     startDistpatcherIfNecessary(true);
                 }
 
-                _dispatcher.rejectPending(consumer);                
+                _dispatcher.rejectPending(consumer);
             }
             else
             {

Modified: 
incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java?rev=582266&r1=582265&r2=582266&view=diff
==============================================================================
--- 
incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
 (original)
+++ 
incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
 Fri Oct  5 06:39:25 2007
@@ -480,15 +480,14 @@
             {
                 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 @@
 
             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 @@
             _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);
                 }
             }
         }