summaryrefslogtreecommitdiff
path: root/java/common/src/main
Commit message (Collapse)AuthorAgeFilesLines
* Add licenscesAidan Skinner2008-03-313-0/+63
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@643153 13f79535-47bb-0310-9956-ffa450edef68
* QPID-847 : Prevented the InvalidArgumentException from closing the connection.Martin Ritchie2008-03-183-0/+17
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@638346 13f79535-47bb-0310-9956-ffa450edef68
* QPID-107 : Changes based on code review. Martin Ritchie2008-03-101-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@635602 13f79535-47bb-0310-9956-ffa450edef68
* QPID-806 : Added startsWith and endsWith methods to AMQShortString, ↵Martin Ritchie2008-02-251-620/+692
| | | | | | including test. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@630723 13f79535-47bb-0310-9956-ffa450edef68
* QPID-790 : Performance ImprovementsRobert Godfrey2008-02-222-34/+9
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@630239 13f79535-47bb-0310-9956-ffa450edef68
* QPID-790 : Performance ImprovementsRobert Godfrey2008-02-2118-151/+1816
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@629731 13f79535-47bb-0310-9956-ffa450edef68
* Qpid-594: make AMQConnection listen for exceptions that are thrown ↵Aidan Skinner2008-02-191-40/+47
| | | | | | asynchronously in it's constructor and do something appropriate with them git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@629158 13f79535-47bb-0310-9956-ffa450edef68
* QPID-9 : Nested field tables implemented. Also wrote a test that ↵Rupert Smith2008-02-143-93/+263
| | | | | | encodes/decodes one to check it works. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@627789 13f79535-47bb-0310-9956-ffa450edef68
* QPID-790 : Performance ImprovementsRobert Godfrey2008-02-136-25/+86
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@627552 13f79535-47bb-0310-9956-ffa450edef68
* QPID-789 : FieldTable putDataInBuffer method not thread safeRobert Godfrey2008-02-131-3/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@627416 13f79535-47bb-0310-9956-ffa450edef68
* QPID-588: change instances of trace() and isTraceEnabled to debug equivalent ↵Aidan Skinner2008-02-081-13/+13
| | | | | | to support older versions of log4j git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@619868 13f79535-47bb-0310-9956-ffa450edef68
* Merged revisions 608477,609961,610475,610479,610806,611146 via svnmerge from Aidan Skinner2008-01-281-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://svn.apache.org/repos/asf/incubator/qpid/branches/M2 ........ r608477 | rgodfrey | 2008-01-03 13:23:04 +0000 (Thu, 03 Jan 2008) | 1 line QPID-499 : Added per-virtual host timed tasks to inspect queues (with no consumers) for expired messages ........ r609961 | ritchiem | 2008-01-08 12:59:01 +0000 (Tue, 08 Jan 2008) | 2 lines QPID-499 : Patch to update the queue size statistics when the Active TTL process runs Removed old single commented out code line from AMQSession. ........ r610475 | ritchiem | 2008-01-09 17:32:43 +0000 (Wed, 09 Jan 2008) | 1 line Qpid-723 Added exec to qpid.start ........ r610479 | ritchiem | 2008-01-09 17:39:54 +0000 (Wed, 09 Jan 2008) | 1 line Qpid-690 : Provide configurable delay between re-connecion attempts. ........ r610806 | ritchiem | 2008-01-10 14:41:37 +0000 (Thu, 10 Jan 2008) | 1 line QPID-690 : Relaxed the timings on failover as Thread.sleep is accurate to 10ms so may finish the sleep 10ms early. Resulting in erratic failures as 9.9s < 10s. ........ r611146 | ritchiem | 2008-01-11 11:33:31 +0000 (Fri, 11 Jan 2008) | 1 line Patch by Aidan Skinner to make third constructor public. This is done so that the BDBMessageStore tests can still run with the addition of the VirtualHost reaper thread. ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@615943 13f79535-47bb-0310-9956-ffa450edef68
* Merged revisions ↵Aidan Skinner2008-01-244-144/+483
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 598285,598619,598721,598834-598835,599375,599531,599533,599572,599805,602134,604151,604928,605536,605542,606015-606016 via svnmerge from https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1 ........ r598285 | ritchiem | 2007-11-26 14:16:01 +0000 (Mon, 26 Nov 2007) | 3 lines QPID-92, QPID-564 : Upgraded Mina to 1.0.1 still not good enough but all future versions currently have a bug with the CumulativeProtocolDecoder. It compact()s the buffer which breaks slices. Added MultiThread Support which is some of the feature set of QPID-564 ........ r598619 | ritchiem | 2007-11-27 12:51:14 +0000 (Tue, 27 Nov 2007) | 1 line Renamed POMs to M2.1.1 Removed erroneous equals() in SpecificMethodFrameListenerTest ........ r598721 | ritchiem | 2007-11-27 18:09:33 +0000 (Tue, 27 Nov 2007) | 1 line QPID-621 : Patch Supplied by Aidan Skinner. Msg Ack after msg consumer is closed. ........ r598834 | ritchiem | 2007-11-28 00:45:32 +0000 (Wed, 28 Nov 2007) | 14 lines QPID-679 : Patch provided by Aidan Skinner and additional from odd problems during test runs. AMQChannel - Catch and log AMQException occuring when requeue()-ing. Previously exceptions wouldn't be caught at all. The requeue() is called during closure so there is nothing we can do protocol wise on error other than log the issue and continue with any other shutdown that is needed. AMQMinaProtocolSession & AMQPFastProtocolHandler . Additions to catch and log AMQExceptions. Changes to AMQMinaProtocolSession were done to ignore all input on a closing session other than the close-ok. Previously only Protocol frames were ignored this resulted in Content*Body-s still being processed. Additional checks were made for the MessageStoreClosedException to log and continue. As said else were we need to seperate protocol exceptoions(AMQException) from internal code exception handling. Further All AMQExceptions occuring in the frameReceived method are now caught and logged. Allowing them to propogate higher will only result in thread death. AMQPFastProtocolHandler Caught AMQExceptions occuring whilst closing the session. Again allowing these to continue will result in thread death. There is not a lot that can be done other than log the problem as the session is already closed by this point. Prevented the stacktrace associated with a session exception being printed in the exceptionCaught method when the problem was an IO Exception. This doesn't add anything useful and only adds to the log file sizes. ApplicationRegistry - Added removeAll option which ensures that all ARs are correctly purged so that we can attempt to clean up between Unit Tests. MemoryMessageStore - This was causing us real problems during the failover testing. Similar checks should probably be made to any other Message Store Impl. The issue was that when shutting down the broker the MS.close() method is called this sets all the storage to null. However, there may still be message processing going on as the close() does not attempt to stop connection processing. Hence we now check to see if the Store is close throwing a MSClosedException if required. This prevents NPEs that have been seen during Unit failover testing. In fact the close() is called as a request to shutdown the ApplicationRegistry, but this only occurs from tests and broker shutdown, no attempt to unbind or prevent further connections during this period is yet done. CLIENT CHANGES AMQConnection - Added method to check if failover is in progress. AMQClient - Upgraded acknowledge() exception to JMSException for errors due to failover. Also , added call to update consumers as a result of failover. BasicMessageConsumer - Changes to acquireReceiving to take in to consideration blocking for failover to occur. wrt receiveNoWait.. which previously blocked for failover to complete... not exactly noWait. acknowledge will now TransportConnection - Update to ensure all inVM brokers are correctly killed. FailoverTest - QPID-679 - Finder of all the above problems. ........ r598835 | ritchiem | 2007-11-28 01:01:05 +0000 (Wed, 28 Nov 2007) | 1 line CommitRollbackTest - this one just was never right.. now we have something better. ........ r599375 | ritchiem | 2007-11-29 10:58:08 +0000 (Thu, 29 Nov 2007) | 1 line Update to broker to address fanout python failure. ........ r599531 | ritchiem | 2007-11-29 17:56:12 +0000 (Thu, 29 Nov 2007) | 1 line QPID-92 QPID-564 Forgot to upgrade mina to 1.0.1 ........ r599533 | ritchiem | 2007-11-29 18:25:21 +0000 (Thu, 29 Nov 2007) | 1 line QPID-564 QPID-92 Tidied up a few points and fixed infinite loop in Read IO Thread ........ r599572 | ritchiem | 2007-11-29 20:56:22 +0000 (Thu, 29 Nov 2007) | 2 lines Mina Fix: Vm Pipe Starts Connection session before acceptor session. This results in protocol frames arriving before the protocol decoder has been configured on the InVM Broker. Verification of this could be done by adding a client side filter that delays the first message by a few seconds. ........ r599805 | ritchiem | 2007-11-30 12:47:08 +0000 (Fri, 30 Nov 2007) | 1 line Added new simple Request/Repsonse code as my last commit here seems to have missed the actual code. ........ r602134 | rupertlssmith | 2007-12-07 16:00:14 +0000 (Fri, 07 Dec 2007) | 1 line Added JDNI config for two broker, failover setup for failover tests. Also passed into FT tests config. ........ r604151 | ritchiem | 2007-12-14 10:40:37 +0000 (Fri, 14 Dec 2007) | 2 lines QPID-707 : Added new test to check message count on broker as messages are consumed to ensure that an ack is sent at 5000 mgs. Added acks on message consumer closure. Augmented VMTestCase to have helper methods for accessing broker statistics. ........ r604928 | rupertlssmith | 2007-12-17 17:00:10 +0000 (Mon, 17 Dec 2007) | 1 line DUPS_OK mode set to be same as AUTO_ACK, fixed broken dups ok test. ........ r605536 | rupertlssmith | 2007-12-19 13:40:05 +0000 (Wed, 19 Dec 2007) | 1 line Messages were being sent mandatory by default, set to false. ........ r605542 | rupertlssmith | 2007-12-19 13:53:44 +0000 (Wed, 19 Dec 2007) | 1 line Changed test configs to use colons instead of commas. ........ r606015 | rgodfrey | 2007-12-20 20:08:01 +0000 (Thu, 20 Dec 2007) | 2 lines QPID-714 : (Patch from Aidan Skinner) Issue with competing, transactional/client-ack consumers Ack each individual message on commit, not use multiple acks ........ r606016 | rgodfrey | 2007-12-20 20:12:25 +0000 (Thu, 20 Dec 2007) | 2 lines QPID-714 : (Patch from Aidan Skinner) Issue with competing, transactional/client-ack consumers Ack each individual message on commit, not use multiple acks ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@614906 13f79535-47bb-0310-9956-ffa450edef68
* QPID-718 : NPE when binding queue with null routing keyRobert Godfrey2008-01-031-0/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@608570 13f79535-47bb-0310-9956-ffa450edef68
* QPID-92, QPID-564 : Upgraded Mina to 1.0.1 still not good enough but all ↵Martin Ritchie2007-11-268-0/+3183
| | | | | | future versions currently have a bug with the CumulativeProtocolDecoder. It compact()s the buffer which breaks slices. Added MultiThread Support which is some of the feature set of QPID-564 git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@598324 13f79535-47bb-0310-9956-ffa450edef68
* QPID-567 : Add mutliversion support to Qpid/Java, fixed client support when ↵Robert Godfrey2007-11-261-3/+14
| | | | | | | | | | server returns Protocol header. Added QueueUnbind Added ability to select protocol version in ConnectionURL or with -Dorg.apache.qpid.amqp_version git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@598105 13f79535-47bb-0310-9956-ffa450edef68
* QPID-567 : Add mutliversion support to Qpid/Java.Robert Godfrey2007-11-2421-151/+739
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@597918 13f79535-47bb-0310-9956-ffa450edef68
* Qpid-558 : Patch provided by Aidan Skinner addressing AMQShortString not ↵Martin Ritchie2007-10-051-0/+1
| | | | | | autoexpand-ing so when adding content to it would throw an exception git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@582265 13f79535-47bb-0310-9956-ffa450edef68
* QPID-604 Commited patch provided by Aidan Skinner, to prevent NPE in FieldTable.Martin Ritchie2007-09-251-1/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@579115 13f79535-47bb-0310-9956-ffa450edef68
* Refactored interop tests into general distributed test framework. Moved ↵Rupert Smith2007-07-251-6/+8
| | | | | | framework under systests from integrationtests. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@559419 13f79535-47bb-0310-9956-ffa450edef68
* Update fix incorrect license headers.Martin Ritchie2007-07-182-22/+28
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@557306 13f79535-47bb-0310-9956-ffa450edef68
* QPID-541 : Change to use threadlocal maps for intern for the common case to ↵Robert Godfrey2007-07-171-12/+38
| | | | | | avoid excessive synchronization. In the uncommon case will require more lookup. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@556898 13f79535-47bb-0310-9956-ffa450edef68
* QPID-541 A large portion of memory was being wasted in 32k ByteBuffers being ↵Martin Ritchie2007-07-171-1/+31
| | | | | | | | | held by the AMQShortStrings. Patch submitted by Robert Godfrey to intern() the AMQSSs to reduce memory usage. Current implementation *will* impact performance due to the usage of a static Map for storage. However, a thread local implementation is in the works. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@556890 13f79535-47bb-0310-9956-ffa450edef68
* Various License header updates.Martin Ritchie2007-06-1810-0/+190
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@548276 13f79535-47bb-0310-9956-ffa450edef68
* Removed log4j dependency from client. Using slf4j instead, end-user to ↵Rupert Smith2007-06-1117-331/+381
| | | | | | supply logging implementation as desired. Log4j used for tests. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@546190 13f79535-47bb-0310-9956-ffa450edef68
* QPID-402: FailoverException falling through to client. All blocking ↵Rupert Smith2007-06-014-9/+21
| | | | | | operations now wrapped in failover support wrappers. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@543496 13f79535-47bb-0310-9956-ffa450edef68
* QPID-482 : Small performance tweaksRobert Godfrey2007-05-246-25/+37
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@541247 13f79535-47bb-0310-9956-ffa450edef68
* Documented all exception.Rupert Smith2007-05-2120-71/+212
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@540107 13f79535-47bb-0310-9956-ffa450edef68
* Added to the JavadocRupert Smith2007-05-1713-185/+728
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@538907 13f79535-47bb-0310-9956-ffa450edef68
* More Javadocing.Rupert Smith2007-05-154-18/+131
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@538109 13f79535-47bb-0310-9956-ffa450edef68
* Added to the Javadoc.Rupert Smith2007-05-147-67/+288
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@537782 13f79535-47bb-0310-9956-ffa450edef68
* Whitespace + Formatting.Martin Ritchie2007-05-091-18/+15
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@536499 13f79535-47bb-0310-9956-ffa450edef68
* QPID-482 : Small performance enhancementsRobert Godfrey2007-05-093-64/+86
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@536480 13f79535-47bb-0310-9956-ffa450edef68
* QPID-466 Updated FieldTable to ensure no Decimal value is set that is larger ↵Martin Ritchie2007-05-071-0/+10
| | | | | | | | | | than can be transmitted over AMQP. That is a max scale value of Byte.MAX_VALUE and value of up to Integer.MAX_VALUE. Additional tests to ensure this is the case. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@535809 13f79535-47bb-0310-9956-ffa450edef68
* QPID-466 Changes to FieldTable along with corresponding PropertyValueTest to ↵Martin Ritchie2007-05-042-97/+134
| | | | | | limit the Java client to only AMQP 0-8 compliant values. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@535309 13f79535-47bb-0310-9956-ffa450edef68
* Removed accidental inclusion of copyright notices.Robert Greig2007-05-021-4/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@534478 13f79535-47bb-0310-9956-ffa450edef68
* QPID-453 : AMQShortString should implement ComparableRobert Godfrey2007-04-161-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@529297 13f79535-47bb-0310-9956-ffa450edef68
* Got rid of some uses of System.out instead of log4j logging.Robert Greig2007-04-091-59/+42
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@526807 13f79535-47bb-0310-9956-ffa450edef68
* Got rid of some uses of System.out instead of log4j logging.Robert Greig2007-04-093-216/+142
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@526803 13f79535-47bb-0310-9956-ffa450edef68
* Stopped throwing away exception causes.Robert Greig2007-04-096-27/+68
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@526776 13f79535-47bb-0310-9956-ffa450edef68
* Purged logging from exception constructors.Robert Greig2007-04-094-91/+43
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@526714 13f79535-47bb-0310-9956-ffa450edef68
* QPID-443 : Fix to transactionality of message publishingRobert Godfrey2007-04-052-0/+35
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@525862 13f79535-47bb-0310-9956-ffa450edef68
* Added simeple file copy function.Robert Greig2007-04-041-0/+36
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@525533 13f79535-47bb-0310-9956-ffa450edef68
* Added standard command line handlineRobert Greig2007-04-041-5/+37
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@525531 13f79535-47bb-0310-9956-ffa450edef68
* Correction to exception type thrown.Robert Greig2007-03-191-10/+10
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@519933 13f79535-47bb-0310-9956-ffa450edef68
* Commit of interop test stuff prior to M2 branch.Robert Greig2007-03-153-0/+471
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@518559 13f79535-47bb-0310-9956-ffa450edef68
* QPID-346,QPID-386,QPID-403, QPID-410 Rollback, Basic-Reject, QueueBrowser ↵Martin Ritchie2007-03-131-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NO_ACK. QPID-346 Message loss after rollback\recover QPID-386 Updated Transactional Tests to cover underlying AMQP/Qpid state. QPID-403 Implement Basic.Reject QPID-410 Queue Browsers should use not acknowledge messages. ------------------------------------- Broker TxAck - Added comment and fixed white space UnacknowledgedMessage - Added comment for messageDecrement AMQChannel - Added extra debugging. + Created a NonTransactionalContext for requeuing messages as using txContext will tie the requeue to any runing transaction. + Updated message reference counting. So it is in terms of queues don't increment when giving to client. BasicCancelMethodHandler - Added Debug log. BasicConsumeMethodHandler - Reverted to directly writes frames to the session, throwing ChannelException caused problems. Added Trace and debug logging. BasicRejectMethodHandler, ChannelCloseHandler, ConnectionCloseMethodHandler - Added Debug logging AMQPFastProtocolHandler - moved error log to before session.write AMQMessage - Added additional debug via debugIdentity() and comments AMQQueue - Decoupled reference counting from dequeue operation. ConcurrentSelectorDeliveryManager - Added comments and increased info in debug logging SubscriptionImpl - Disabled use of acks for browsers. For now put setDeliveredToConsumer back in the finally block. commented that I'm not sure this is correct as even an error writing to client will cause msg to be marked delivered to consumer. + On Close ensured that it is only called once. + Had problem where closing browser was causing two CancelOk frames to be sent back to client. RequiredDeliveryException - Added comment to explain incrementReference LocalTransactionalContext - Commented out incrementReference as it shouldn't be required here. NonTransactionalContext - Removed incrementReference on deliver + - Fixed bug where browsers - acks would cause messages to be discarded. new JIRA this needs tidied up. TxnBuffer - Added debug logging. Client ------ AMQQueueBrowser - Added comments AMQSession - Added comments and debug + Updated to cause closed consumer to reject messages rather than receive them. + Prevented NoConsumer's from rollingback and rejecting.. they simply clear their SyncQueue - JIRA to ensure clean state with rollback BasicMessageConsumer - Added trace level debuging on close calls + Forced noConsume-rs to use NO_ACK + added more logging Closeable - Updated to use isClosed rather than directly calling _closed.get() to aid in future work on ensuring multi threaded close still allows pending acks to be processed first. ChannelCloseOkMethodHandler - updated comment AMQProtocolSession - Update comments,whitespace TransportConnection - removed static block FlowControllingBlockingQueue - Added isEmpty() Method PropertyValueTest - Added VM Broker setup + Updated test to run once and 50 times to pull out delivery tag problems that were occuring. + Adjusted logging level to be more helpful. moved some info down to trace and debug. MessageRequeueTest - Moved QpidClientConnection its own file. + Fixed it so it actually runs more than one consumer, concurrently.Now 3 was 1. ConcurrentLinkedMessageQueueAtomicSize - Implemented iterator(). Added QueueBrowserTest to system tests to test QueueBrowsering. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@517638 13f79535-47bb-0310-9956-ffa450edef68
* QPID-403 QPID-346 QPID-355 QPID-386 QPID-389 Updates to fix Transactional ↵Martin Ritchie2007-03-062-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rollback. QPID-346 Message loss after rollback\recover QPID-355 Closing a consumer does not ensure messages delivery will stop for that subscription QPID-386 Updated Transactional Tests to cover underlying AMQP/Qpid state. QPID-389 Prefetched message are not correctly returned to the queue QPID-403 Implement Basic.Reject Broker UnacknowledgedMessage - Added toString for debug UnacknowledgedMessageMapImpl - Removed resendMessages method as all sending should go via DeliveryManager and Subscription. AMQChannel - Updated resend and requeue methods so they do not directly write messages to a subscriber. This was violating the suspension state. - Used a local non-transactional context to requeue messages as the internal requeuing of messages on the broker should not be part of any client transaction. - Maked messages as resent. - Removed warnings from IDE about missing JavaDoc text etc. BasicAckMethodHandler - Added debugging BasicRecoverMethodHandler - Removed session from the resend call. BasicRejectMethodHandler - Initial implementation. Hooks left for possible 'resend' bit. ChannelCloseHandler - Fixed bug where channel wasn't marked as fully closed on reception of a close from the client. TxRollbackHandler - Removed session from resend call. AMQMinaProtocolSession - Fixed bug where channel was marked as awaiting closure before it had actually been closed. This causes problems as the close looks up the channel by id again which will return null after it has been marked as awaiting closure. AMQMessage - Initial implementation of Rejection. Currently inactive in hasInterest() as we are miss-using reject to requeue prefetched messages from the client. AMQQueue - Removed debug method as it made reading the log very difficult as all the logs had the same line number ConcurrentSelectorDeliveryManager - Fixed clearAllMessages() as it didn't actually remove the messages. - Fixed bad logic in getNextMessage when using null subscriber. (as done by clearAllMessages) - Added more logging messages. Made more frequent logging a trace value. - Added debugIdentity() method to reduce over head in calculating standard log prefix. - Allowed messages to be added to the front of the queue. - Added currentStatus() to an overview of the queue's current state. SubscriptionImpl - Updated to handle closure correctly (QPID-355) -Updated the deliver method so it doesn't use a try->finally to do msg.setDeliveredToConsumer() as this would be done even in the event of an error. - Created an additional logger to log suspension calls rather than through the SI logger which logs a lot of detail. Client pom.xml - Excluded older version of log4j that commons-collections exposes. AMQSession - Added ability for dispatcher to start in stopped state. - Added dispatcher logger - Added checks around logging - Added message rejection if the dispatcher receives a message that it doesn't have a consumer for. - Updated message rejection to allow the dispatcher to perform the rejection if running this ensures that all queued messages are processed correctly and rejection occurs in order. - rollback() before calling rollback all pending queued messages must be rejected as rollback will clear unacked map which the rejects caused by rollback() will need. - fixed closedProducersAndConsumers so that it will rethrow any JMS Exception - recover() as for rollback() the rejects need to be done before the Recover Call to the broker. - Allowed delclareExchange to be done synchronously programatically - Updated confirmConsumerCancelled to use the dispatcher to perform the clean up. This required the creation of the dispatcher in stopped mode so that it does not start and message attempted to be delivered while the subscriber is being cancelled. BasicMessageConsumer - Updated close not to perform the deregistration. This is done in via BasicCancelOkMethodHandler - Added guards on logging - Record all messages that have been received so they can be rejected if rollback occurs. so had to change impl of acknowledgeLastDelivered. - Updated Rollback to initially reject all received messages that are still unAcked. - Added a recursive call should the queue not be empty at the end of the rollback.. with a warning. BasicCancelOkMethodHandler - White space changes to meet style guide. Added guard on logging. UnprocessedMessage - White space changes to meet style guide. StateWaiter - Added comment about timeout bug. FlowControllingBlockingQueue - Tidied imports RecoverTest - Updated as declareExchange is now Synchronous ChannelCloseTest - added guard on logging MessageRequeueTest - Added to better test underlying AMQP/Qpid state QPID-386 StreamMessageTest - Updated as declareExchange is now Synchronous CommitRollbackTest - added Additional test case to ensure prefetch queue is correctly purged. TransactedTest - Added logging and additional tests. Cluster SimpleClusterTest - updated in line with AMQSession.delcareExchange changes Common AMQConstant - Fixed error code 'not allowed' should be 530 not 507. ConcurrentLinkedMessageQueueAtomicSize - Updated to beable to get the size of messages on the 'head' queue along with additional debug Systests ReturnUnroutableMandatoryMessageTest - Updated as declareExchange is now Synchronous git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@515127 13f79535-47bb-0310-9956-ffa450edef68
* (Patch submitted by Rupert Smith). java_iop.diffRobert Greig2007-02-281-0/+659
| | | | | | This adds some interop tests (which are just copies of the existing topic tests) in a new integrationtests module. The java 1.4. client build has been updated to be able to run these tests. They succesfully talk to each other and the .net code. This is intended to be a starting point of a more in depth interop test as per the spec, but does not implement what is in the draft spec yet. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@512699 13f79535-47bb-0310-9956-ffa450edef68
* QPID-391 : Broker Refactoring - initial tidy... add some mechanisms for ↵Robert Godfrey2007-02-255-98/+321
| | | | | | multi version git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@511389 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status