You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ru...@apache.org on 2007/05/21 12:57:48 UTC

svn commit: r540107 [2/2] - in /incubator/qpid/branches/M2/java: broker/src/main/java/org/apache/qpid/server/ broker/src/main/java/org/apache/qpid/server/exchange/ broker/src/main/java/org/apache/qpid/server/protocol/ broker/src/main/java/org/apache/qp...

Modified: incubator/qpid/branches/M2/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolHeaderException.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolHeaderException.java?view=diff&rev=540107&r1=540106&r2=540107
==============================================================================
--- incubator/qpid/branches/M2/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolHeaderException.java (original)
+++ incubator/qpid/branches/M2/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolHeaderException.java Mon May 21 03:57:30 2007
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -22,10 +22,20 @@
 
 import org.apache.qpid.AMQException;
 
+/**
+ * AMQProtocolHeaderException indicates a format error in an AMQP frame header.
+ *
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td> Represent format error in frame header.
+ * </table>
+ *
+ * @todo Not an AMQP exception as no status code.
+ */
 public class AMQProtocolHeaderException extends AMQException
 {
-   public AMQProtocolHeaderException(String message)
-   {
-       super(message);
-   }
+    public AMQProtocolHeaderException(String message)
+    {
+        super(message);
+    }
 }

Modified: incubator/qpid/branches/M2/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolInstanceException.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolInstanceException.java?view=diff&rev=540107&r1=540106&r2=540107
==============================================================================
--- incubator/qpid/branches/M2/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolInstanceException.java (original)
+++ incubator/qpid/branches/M2/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolInstanceException.java Mon May 21 03:57:30 2007
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,10 +20,20 @@
  */
 package org.apache.qpid.framing;
 
+/**
+ * AMQProtocolInstanceException indicates that the protocol instance is incorrect in a header.
+ *
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td> Represent incorrect protocol instance in frame header.
+ * </table>
+ *
+ * @todo Not an AMQP exception as no status code.
+ */
 public class AMQProtocolInstanceException extends AMQProtocolHeaderException
 {
-   public AMQProtocolInstanceException(String message)
-   {
-       super(message);
-   }
+    public AMQProtocolInstanceException(String message)
+    {
+        super(message);
+    }
 }

Modified: incubator/qpid/branches/M2/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolVersionException.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolVersionException.java?view=diff&rev=540107&r1=540106&r2=540107
==============================================================================
--- incubator/qpid/branches/M2/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolVersionException.java (original)
+++ incubator/qpid/branches/M2/java/common/src/main/java/org/apache/qpid/framing/AMQProtocolVersionException.java Mon May 21 03:57:30 2007
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,13 +21,19 @@
 package org.apache.qpid.framing;
 
 /**
- * Exception that is thrown when the client and server differ on expected protocol version (header) information.
+ * AMQProtocolInstanceException indicates that the client and server differ on expected protocol version  in a header.
+ *
+ * <p/><table id="crc"><caption>CRC Card</caption>
+ * <tr><th> Responsibilities <th> Collaborations
+ * <tr><td> Represent incorrect protocol version in frame header.
+ * </table>
  *
+ * @todo Not an AMQP exception as no status code.
  */
 public class AMQProtocolVersionException extends AMQProtocolHeaderException
 {
-   public AMQProtocolVersionException(String message)
-   {
-       super(message);
-   }
+    public AMQProtocolVersionException(String message)
+    {
+        super(message);
+    }
 }

Modified: incubator/qpid/branches/M2/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java?view=diff&rev=540107&r1=540106&r2=540107
==============================================================================
--- incubator/qpid/branches/M2/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java (original)
+++ incubator/qpid/branches/M2/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java Mon May 21 03:57:30 2007
@@ -68,7 +68,13 @@
  * @todo Why set an event limit of 10 on the Job? This also seems bizarre, as the job can have more than 10 events in
  *       it. Its just that it runs them 10 at a time, but the completion hander here checks if there are more to run
  *       and trips off another batch of 10 until they are all done. Why not just have a straight forward
- *       consumer/producer queue scenario without the batches of 10?
+ *       consumer/producer queue scenario without the batches of 10? So instead of having many jobs with batches of 10
+ *       in them, just have one queue of events and worker threads taking the next event. There will be coordination
+ *       between worker threads and new events arriving on the job anyway, so the simpler scenario may have the same
+ *       amount of contention. I can see that the batches of 10 is done, so that no job is allowed to hog the worker
+ *       pool for too long. I'm not convinced this fairly complex scheme will actually add anything, and it might be
+ *       better to encapsulate it under a Queue interface anyway, so that different queue implementations can easily
+ *       be substituted in.
  *
  * @todo The static helper methods are pointless. Could just call new.
  */