summaryrefslogtreecommitdiff
path: root/java/client
Commit message (Collapse)AuthorAgeFilesLines
* QPID-714 : (Patch from Aidan Skinner) Issue with competing, ↵Robert Godfrey2007-12-202-31/+5
| | | | | | | | 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.1@606015 13f79535-47bb-0310-9956-ffa450edef68
* Multi threaded io commented out until all issues with it are resolved.Rupert Smith2007-12-181-1/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@605217 13f79535-47bb-0310-9956-ffa450edef68
* DUPS_OK mode set to be same as AUTO_ACK, fixed broken dups ok test.Rupert Smith2007-12-171-9/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@604928 13f79535-47bb-0310-9956-ffa450edef68
* QPID-707 : Added new test to check message count on broker as messages are ↵Martin Ritchie2007-12-142-18/+27
| | | | | | | | 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. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@604151 13f79535-47bb-0310-9956-ffa450edef68
* Update to disable ProtectIO by default.Martin Ritchie2007-12-071-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@602082 13f79535-47bb-0310-9956-ffa450edef68
* Removed JMSXUserID as it appears the new mina is conflicting.Martin Ritchie2007-12-073-15/+15
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@602066 13f79535-47bb-0310-9956-ffa450edef68
* Merged revisions 594992-595694,595697-596350,596352-596362,596364-598327 via ↵Rupert Smith2007-11-301-22/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svnmerge from https://svn.apache.org/repos/asf/incubator/qpid/branches/M2 ........ r594992 | ritchiem | 2007-11-14 18:00:28 +0000 (Wed, 14 Nov 2007) | 1 line QPID-685 : Update to address dependency issues and update the NOTICE file. ........ r595687 | rajith | 2007-11-16 14:54:01 +0000 (Fri, 16 Nov 2007) | 1 line moved the keys file to the parent folder ........ r595688 | rajith | 2007-11-16 15:00:22 +0000 (Fri, 16 Nov 2007) | 1 line removed the KEYS file, as now it is in the parent folder ........ r595740 | ritchiem | 2007-11-16 17:06:04 +0000 (Fri, 16 Nov 2007) | 1 line Fixed runtime dependency in the management console. ........ r596342 | rajith | 2007-11-19 15:56:29 +0000 (Mon, 19 Nov 2007) | 1 line added eclipse license details to the NOTICE file ........ r596650 | ritchiem | 2007-11-20 13:14:32 +0000 (Tue, 20 Nov 2007) | 1 line Added the full text of the additional licenses. ........ r596655 | ritchiem | 2007-11-20 13:22:53 +0000 (Tue, 20 Nov 2007) | 2 lines Added the full text of the additional licenses. Moved ICU licence text from NOTICE to LICENSE ........ r596657 | gsim | 2007-11-20 13:32:25 +0000 (Tue, 20 Nov 2007) | 3 lines Added boost license ........ r596665 | ritchiem | 2007-11-20 13:49:34 +0000 (Tue, 20 Nov 2007) | 1 line Added source links for EPL and MPL libraries ........ r598292 | rupertlssmith | 2007-11-26 14:45:15 +0000 (Mon, 26 Nov 2007) | 1 line Added incubator disclaimer. ........ r598311 | rupertlssmith | 2007-11-26 15:40:54 +0000 (Mon, 26 Nov 2007) | 1 line Added AMQP licence information. ........ r598327 | rajith | 2007-11-26 16:04:50 +0000 (Mon, 26 Nov 2007) | 1 line added disclaimers and AMP license to all languages ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@599814 13f79535-47bb-0310-9956-ffa450edef68
* Added new simple Request/Repsonse code as my last commit here seems to have ↵Martin Ritchie2007-11-302-0/+476
| | | | | | missed the actual code. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@599805 13f79535-47bb-0310-9956-ffa450edef68
* Mina Fix: Vm Pipe Starts Connection session before acceptor session. This ↵Martin Ritchie2007-11-291-6/+3
| | | | | | 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. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@599572 13f79535-47bb-0310-9956-ffa450edef68
* CommitRollbackTest - this one just was never right.. now we have something ↵Martin Ritchie2007-11-281-25/+12
| | | | | | better. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@598835 13f79535-47bb-0310-9956-ffa450edef68
* QPID-679 : Patch provided by Aidan Skinner and additional from odd problems ↵Martin Ritchie2007-11-284-26/+85
| | | | | | | | | | | | | | | | | | | | 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. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@598834 13f79535-47bb-0310-9956-ffa450edef68
* QPID-621 : Patch Supplied by Aidan Skinner. Msg Ack after msg consumer is ↵Martin Ritchie2007-11-273-2/+46
| | | | | | closed. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@598721 13f79535-47bb-0310-9956-ffa450edef68
* Renamed POMs to M2.1.1 Removed erroneous equals() in ↵Martin Ritchie2007-11-276-104/+6
| | | | | | SpecificMethodFrameListenerTest git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@598619 13f79535-47bb-0310-9956-ffa450edef68
* Merged revisions 598106-598232,598234-598286,598288-598323,598325-598361 via ↵Martin Ritchie2007-11-263-42/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | svnmerge from https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1 ........ r598337 | ritchiem | 2007-11-26 16:33:06 +0000 (Mon, 26 Nov 2007) | 1 line Last commit accidentally caught my failover change that wasn't complete. ........ r598352 | rupertlssmith | 2007-11-26 17:17:48 +0000 (Mon, 26 Nov 2007) | 1 line May have broken build with tktest plugin mojo, commented out until fixed. ........ r598357 | rupertlssmith | 2007-11-26 17:33:14 +0000 (Mon, 26 Nov 2007) | 1 line Fixed broken plugin. ........ r598360 | ritchiem | 2007-11-26 17:49:05 +0000 (Mon, 26 Nov 2007) | 1 line QPID-690 : Missing Test and code update. ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@598363 13f79535-47bb-0310-9956-ffa450edef68
* QPID-92, QPID-564 : Upgraded Mina to 1.0.1 still not good enough but all ↵Martin Ritchie2007-11-262-38/+72
| | | | | | 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.1@598285 13f79535-47bb-0310-9956-ffa450edef68
* QPID-160 Addition of JMSXUserID to all messages through the java broker.Martin Ritchie2007-11-073-25/+45
| | | | | | | | As this will cause the headers to be re-encoded it can be disabled in the config.xml. Default is enabled as the sample config.xml should have all features enabled so that testing can observe the interactions. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@592729 13f79535-47bb-0310-9956-ffa450edef68
* QPID-662 Transactional state not correctly reported after fail over. We now ↵Martin Ritchie2007-11-066-156/+301
| | | | | | | | record if we have sent any messages from here we can check if we have failed over and so have lost messages from the transaction making it invalid. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@592374 13f79535-47bb-0310-9956-ffa450edef68
* QPID-663 Messages fail to be received after fail over. This is due to the ↵Martin Ritchie2007-11-061-10/+8
| | | | | | old protocol session being reinstated after fail over. The new protocol session needs to be set in the StateManager as this maintains its own reference which is not being updated hence messages are being lost. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@592373 13f79535-47bb-0310-9956-ffa450edef68
* Additional Test for ConnectionURLTest, ensuring retries are correctly parsed.Martin Ritchie2007-11-051-6/+43
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@591960 13f79535-47bb-0310-9956-ffa450edef68
* QPID-654 : added a shutdownNow() call if the _taskPool hasn't terminiated by ↵Martin Ritchie2007-10-191-1/+11
| | | | | | the time we have finished closing. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@586374 13f79535-47bb-0310-9956-ffa450edef68
* QPID-653 : Updated timeoutsRobert Godfrey2007-10-195-25/+25
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@586344 13f79535-47bb-0310-9956-ffa450edef68
* QPID-637 : Patch provided by Aidan Skinner to ensure correct behaviour of ↵Martin Ritchie2007-10-182-127/+110
| | | | | | session closure. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@585912 13f79535-47bb-0310-9956-ffa450edef68
* QPID-637 Patch submitted by Aidan Skinner to address receive not waiting for ↵Martin Ritchie2007-10-111-10/+31
| | | | | | full timeout. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@583882 13f79535-47bb-0310-9956-ffa450edef68
* QPID-635 Added a unit test and implemented the equals() method on ↵Martin Ritchie2007-10-113-0/+102
| | | | | | BlockingMethodFrameListener and SpecificMethodFrameListener. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@583775 13f79535-47bb-0310-9956-ffa450edef68
* QPID-631 : Patch provided by Aidan Skinner to address the errors in the ↵Martin Ritchie2007-10-101-4/+4
| | | | | | MessageRequeueTest. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@583546 13f79535-47bb-0310-9956-ffa450edef68
* QPID-627 : Update provided by Aidan Skinner to correctly close resources ↵Martin Ritchie2007-10-101-0/+2
| | | | | | used by Large Message Test. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@583418 13f79535-47bb-0310-9956-ffa450edef68
* Qpid-627 Patch provided by Aidan Skinner to address hangs in ↵Martin Ritchie2007-10-091-8/+11
| | | | | | DurableSubscriptionTest. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@583154 13f79535-47bb-0310-9956-ffa450edef68
* Qpid-626 : Patch provided by Aidan Skinner to address AMQSession Deadlocks.Martin Ritchie2007-10-091-4/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@583147 13f79535-47bb-0310-9956-ffa450edef68
* QPID-625 : Fix commit rollback test to prevent failures caused by incorrect ↵Robert Godfrey2007-10-091-3/+10
| | | | | | assertions in the test git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@583105 13f79535-47bb-0310-9956-ffa450edef68
* Update to provide a UUID.randomUUID() when getLocalHost() throws an ↵Martin Ritchie2007-10-091-7/+14
| | | | | | | | UnknownHostException. Update to formatting git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@583086 13f79535-47bb-0310-9956-ffa450edef68
* QPID-551 : Patch provided by Aidan Skinner to address problems in info ↵Martin Ritchie2007-10-052-9/+11
| | | | | | 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
* QPID-624 : Forgot to commit updates to test along with ↵Martin Ritchie2007-10-051-30/+47
| | | | | | BlockingMethodFrameListener git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@582202 13f79535-47bb-0310-9956-ffa450edef68
* QPID-624: Update to ensure all errors are correctly processed in ↵Martin Ritchie2007-10-051-23/+61
| | | | | | BlockingMethodFrameListener.java git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@582201 13f79535-47bb-0310-9956-ffa450edef68
* QPID-614 : Applied supplementary patch from Aidan Skinner.Martin Ritchie2007-10-031-20/+22
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@581627 13f79535-47bb-0310-9956-ffa450edef68
* QPID-584 : Fixed issue where ALL errors are presented to client as a ↵Martin Ritchie2007-10-031-1/+1
| | | | | | connection closing error. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@581621 13f79535-47bb-0310-9956-ffa450edef68
* QPID-617 : Transactional consume does not ack messages.Martin Ritchie2007-10-031-15/+19
| | | | | | Problem is that we were not classing msgs as consumed until onMessage completed in the transactional case. This patch corrects that. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@581540 13f79535-47bb-0310-9956-ffa450edef68
* QPID-615, Added patched version of MINAs VM Pipe cleanup thread. Will ↵Rupert Smith2007-10-021-0/+125
| | | | | | replace once bug fix is in newer version of MINA. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@581293 13f79535-47bb-0310-9956-ffa450edef68
* QPID-614 : Applied patch supplied by Aidan SkinnerRobert Godfrey2007-10-021-28/+51
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@581189 13f79535-47bb-0310-9956-ffa450edef68
* QPID-611 QPID-620. DurableSubscriptionTest was failing due to a race ↵Martin Ritchie2007-10-011-14/+29
| | | | | | condition when using NO_ACK. This is due to the Queue Total Size being updated after the send, but after the send and NO_ACK the msg data is purged and so there is no size to retrieve. Changed all references to msg.dequeue to queue.dequeue where appropriate so we can use that single point in the future for updating the Queue Total Size. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@580993 13f79535-47bb-0310-9956-ffa450edef68
* QPID-595 CommitRollbackTest Patch provided by Aidan Skinner to address ↵Martin Ritchie2007-10-011-4/+3
| | | | | | intermittent test failure. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@580992 13f79535-47bb-0310-9956-ffa450edef68
* QPID-597 : TopicSessionTest Failure, Patch supplied by Aidan Skinner.Martin Ritchie2007-09-281-8/+15
| | | | | | ResetMessageListenerTest.java was changing the prefetch method via a system property that propogated to all tests. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@580258 13f79535-47bb-0310-9956-ffa450edef68
* QPID-596 : ConnectionStartTest was broken. I've fixed it but here is the ↵Martin Ritchie2007-09-271-19/+34
| | | | | | | | | | | | | | | | | | | | | | | problem for those like me that like to know why: Previously: The setUp method created a producer connection and then sent a message - This will result in that message being bounced as there is no consumer. The first test should fail but the test was wrong, which caused it to pass. There was an assert that was expecting the receive a message yet the test was recieve() == null !!!! The second test worked because the broker was not killed between tests This left the queue created so on the second run the message was delivered causing the test to succeed. Now: Fixed the InVM broker setup/teardown so the client is created first and the broker removed at the end of the test. Also updated the asserts to be more explicit rather than having the == null or !=null put that as assertNull/NotNull. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@580022 13f79535-47bb-0310-9956-ffa450edef68
* Update for three tests that don't remove their VMBrokerMartin Ritchie2007-09-263-0/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@579709 13f79535-47bb-0310-9956-ffa450edef68
* Updated TransportConnection to synchronize around the creation/destruction ↵Martin Ritchie2007-09-262-65/+80
| | | | | | | | | | of VM Brokers. I had observed a ConcurrentModificationException in the KillAllVMBrokers(). This isn't good this suggests that the tests are overlapping. This fix won't address that problem but will stop any CModifications occuring. If there is test setup/teardown overlapping we should now see tests failing because the VM broker isn't there. Potentially addresses VM issues in QPID-596 git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@579577 13f79535-47bb-0310-9956-ffa450edef68
* QPID-612 : Use same scheme for every creation of temporary queue namesRobert Godfrey2007-09-243-128/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@578845 13f79535-47bb-0310-9956-ffa450edef68
* Updated Example and management pom files to refer to M2.1 rather than M2Martin Ritchie2007-09-241-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@578828 13f79535-47bb-0310-9956-ffa450edef68
* Merged revisions ↵Rupert Smith2007-09-244-64/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 575663-575687,575689-576860,576862-577192,577194-577315,577317-577659,577661-578047,578049-578060,578062-578604 via svnmerge from https://svn.apache.org/repos/asf/incubator/qpid/branches/M2 ........ r575663 | rgodfrey | 2007-09-14 13:43:13 +0100 (Fri, 14 Sep 2007) | 1 line QPID-600 : Deadlock on connection.close ........ r577931 | rgreig | 2007-09-20 22:26:37 +0100 (Thu, 20 Sep 2007) | 1 line Adding timeouts to two wait() calls to prevent hanging ........ r578258 | rgreig | 2007-09-21 21:31:18 +0100 (Fri, 21 Sep 2007) | 1 line QPID-607: dispatcher threads now poll so that the can die when the connection is closed. ........ r578475 | rgreig | 2007-09-22 20:01:59 +0100 (Sat, 22 Sep 2007) | 1 line QPID-608 Fix the test by adding in creation of the VM broker ........ r578509 | rgreig | 2007-09-22 23:05:30 +0100 (Sat, 22 Sep 2007) | 1 line QPID-609 : dispatcher thread was being restarted by the code that closed the consumer due to the receipt of a basic.cancel frame. Move the dispatcher shutdown to the end of the consumer close process. Also rename the dispatcher _closed field since it clashes with a field in the container class. ........ r578604 | rgreig | 2007-09-23 22:29:33 +0100 (Sun, 23 Sep 2007) | 4 lines QPID-589: avoid the deadlock between the session close and the BasicCancelOkHandler by not sending a BasicCancel when the session is being closed. ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@578745 13f79535-47bb-0310-9956-ffa450edef68
* Attempt to fix hanging builds due to client testsRobert Greig2007-09-201-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@577941 13f79535-47bb-0310-9956-ffa450edef68
* Updated poms to refer to M2.1 rather than M2Robert Greig2007-09-201-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@577773 13f79535-47bb-0310-9956-ffa450edef68
* Merged revision 572751 from the trunk, this fixes QPID-573.Rafael H. Schloming2007-09-142-28/+37
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@575788 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status