svn commit: r665798 - in /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport: Data.java Session.java util/Functions.java

[rhs]

Author: rhs
Date: Mon Jun  9 10:46:44 2008
New Revision: 665798

URL: http://svn.apache.org/viewvc?rev=665798&view=rev
Log:
QPID-901: made logging of ids less expensive, also limit how much data we dump 
into the log

Modified:
    
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Data.java
    
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Session.java
    
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/util/Functions.java

Modified: 
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Data.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Data.java?rev=665798&r1=665797&r2=665798&view=diff
==============================================================================
--- 
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Data.java
 (original)
+++ 
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Data.java
 Mon Jun  9 10:46:44 2008
@@ -83,6 +83,7 @@
         StringBuffer str = new StringBuffer();
         str.append("Data(");
         boolean first = true;
+        int left = 64;
         for (ByteBuffer buf : getFragments())
         {
             if (first)
@@ -93,7 +94,12 @@
             {
                 str.append(" | ");
             }
-            str.append(str(buf));
+            str.append(str(buf, left));
+            left -= buf.remaining();
+            if (left < 0)
+            {
+                break;
+            }
         }
         str.append(")");
         return str.toString();

Modified: 
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Session.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Session.java?rev=665798&r1=665797&r2=665798&view=diff
==============================================================================
--- 
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Session.java
 (original)
+++ 
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Session.java
 Mon Jun  9 10:46:44 2008
@@ -123,10 +123,11 @@
         return commandsIn++;
     }
 
-    void identify(Method cmd)
+    final void identify(Method cmd)
     {
-        cmd.setId(nextCommandId());
-        log.debug("ID: [%s] %s", this.channel, cmd);
+        int id = nextCommandId();
+        cmd.setId(id);
+        log.debug("ID: [%s] %s", this.channel, id);
     }
 
     public void processed(Method command)

Modified: 
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/util/Functions.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/util/Functions.java?rev=665798&r1=665797&r2=665798&view=diff
==============================================================================
--- 
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/util/Functions.java
 (original)
+++ 
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/util/Functions.java
 Mon Jun  9 10:46:44 2008
@@ -70,6 +70,11 @@
 
         str.append('"');
 
+        if (limit < buf.remaining())
+        {
+            str.append("...");
+        }
+
         return str.toString();
     }