summaryrefslogtreecommitdiff
path: root/java/broker/src
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Removed JMSXUserID as it appears the new mina is conflicting.Martin Ritchie2007-12-071-9/+9
| | | | 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-15/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Update to broker to address fanout python failure.Martin Ritchie2007-11-292-4/+10
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@599375 13f79535-47bb-0310-9956-ffa450edef68
* Merged revisions 598371-598586 via svnmerge from Rupert Smith2007-11-2814-26/+445
| | | | | | | | | | | | | | | | | | | | | https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1 ........ r598371 | ritchiem | 2007-11-26 18:17:12 +0000 (Mon, 26 Nov 2007) | 1 line Qpid-559 : OSGi Patch Provided by Aidan Skinner ........ r598572 | ritchiem | 2007-11-27 09:44:28 +0000 (Tue, 27 Nov 2007) | 1 line Add Target to ignores list. ........ r598586 | rupertlssmith | 2007-11-27 10:51:29 +0000 (Tue, 27 Nov 2007) | 1 line Now outputs test results in xml format to the surefire reports directory. ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@599036 13f79535-47bb-0310-9956-ffa450edef68
* QPID-679 : Patch provided by Aidan Skinner and additional from odd problems ↵Martin Ritchie2007-11-286-99/+194
| | | | | | | | | | | | | | | | | | | | 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-92, QPID-564 : Upgraded Mina to 1.0.1 still not good enough but all ↵Martin Ritchie2007-11-263-26/+81
| | | | | | 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-071-87/+112
| | | | | | | | 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-647 : Update to ConcurrentSelectorDeliveryManager to restart async ↵Martin Ritchie2007-10-191-7/+7
| | | | | | | | process if a msg is queued that has the potential to be delivered. Delayed the restart until the Filtering subscribers have the message enqueued to their PDQs. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@586489 13f79535-47bb-0310-9956-ffa450edef68
* QPID-647 : Async Process start/stop is not regulated tightly enough. Added ↵Martin Ritchie2007-10-181-17/+20
| | | | | | additional synchronisation to ensure that a new subscriber can start the async if required. As currently the start request can be missed. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@585906 13f79535-47bb-0310-9956-ffa450edef68
* QPID-645 : TxnBuffer should rethrow exceptions encountered on commitRobert Godfrey2007-10-171-8/+20
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@585642 13f79535-47bb-0310-9956-ffa450edef68
* QPID-647 : Update to ConcurrentSelectorDeliveryManager to restart async ↵Martin Ritchie2007-10-171-2/+21
| | | | | | process if a msg is queued that has the potential to be delivered. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@585575 13f79535-47bb-0310-9956-ffa450edef68
* Update to AMQMessage to reset the deliveredToConsumer flag(false) when the ↵Martin Ritchie2007-10-171-2/+6
| | | | | | message is released. This flag is now used by more than the immediate delivery. It is also used to understand if the message has been delivered so that we can tell the message should not be purged. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@585570 13f79535-47bb-0310-9956-ffa450edef68
* QPID-643 : CSDM causes duplicate message delivery. Don't deliver messages ↵Martin Ritchie2007-10-171-1/+34
| | | | | | that have been taken. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@585565 13f79535-47bb-0310-9956-ffa450edef68
* QPID-636 : Check to ensure we only enqueue msgs that can be delivered to the ↵Martin Ritchie2007-10-111-2/+5
| | | | | | consumer. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@583808 13f79535-47bb-0310-9956-ffa450edef68
* QPID-578 : Queue Deletion causes unacked msgs to be discard resulting in the ↵Martin Ritchie2007-10-103-4/+28
| | | | | | RejcectHandler throwing NPE when it too tries to discard the message. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@583415 13f79535-47bb-0310-9956-ffa450edef68
* Update to correct error log that would occur when using selectors.Martin Ritchie2007-10-091-2/+9
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@583088 13f79535-47bb-0310-9956-ffa450edef68
* Qpid-623 : When only selectors are used on a queue the main _messages queue ↵Martin Ritchie2007-10-051-9/+48
| | | | | | causes a leak. Here is a new test provided by Aidan Skinner and a simple fix that will prevent OOME when only selectors are connected to the Queue. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@582263 13f79535-47bb-0310-9956-ffa450edef68
* QPID-611 QPID-620. DurableSubscriptionTest was failing due to a race ↵Martin Ritchie2007-10-015-17/+35
| | | | | | 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-611 : Queue Total size calculations can cause NPE on broker. Patch ↵Martin Ritchie2007-09-281-1/+1
| | | | | | supplied by Aidan Skinner git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@580265 13f79535-47bb-0310-9956-ffa450edef68
* QPID-610 : Fix for ManagementConcole NO_ACK & Msg Expire leaks. Updated ↵Martin Ritchie2007-09-265-39/+180
| | | | | | | | | | AMQQueueMBeanTest to verify the contents of the MessageStore after clearing. All the MC features only dequeued the message and didn't correctly decrementReference. The MessageReturnTest was failing due to the TimeToLive test causing messages to be left on the store. The expired messages were not having the reference decremented. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@579574 13f79535-47bb-0310-9956-ffa450edef68
* QPID-610 : Fix for Get NO_ACK leak. The Java Client doesn't use get so ↵Martin Ritchie2007-09-251-0/+5
| | | | | | | | | augmented the python test_get to send persistent messages and used debugger to verify that messages were correctly removed. Verified that prior to this commit they would remain in the store. We need a management exchange to fully validate this with a python tests. NOTE: The setting of "delivery mode" property on M2.1 is not the same as on trunk where _ is use such as "delivery_mode". There is also no error that you have sent an incorrect property. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@579229 13f79535-47bb-0310-9956-ffa450edef68
* Update to start M2.1 python test broker on port 2100 (management 2101) and ↵Martin Ritchie2007-09-251-2/+2
| | | | | | for the tests to use that broker. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@579198 13f79535-47bb-0310-9956-ffa450edef68
* QPID-610 : Fix for Returned Messages leak. Augmented ↵Martin Ritchie2007-09-251-0/+2
| | | | | | | | TestableMemoryMessageStore to allow it to query the MemoryMessageStore in use by the broker. New MessageReturnTest to verify no leak after messages have been returned. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@579147 13f79535-47bb-0310-9956-ffa450edef68
* QPID-612 : Use same scheme for every creation of temporary queue namesRobert Godfrey2007-09-241-6/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@578845 13f79535-47bb-0310-9956-ffa450edef68
* QPID-606: synchronize retrieval of application registry to avoid race ↵Robert Greig2007-09-211-17/+20
| | | | | | | | | conditions. This was particularly affecting systests which use the in-VM broker. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@578058 13f79535-47bb-0310-9956-ffa450edef68
* QPID-531 : NO_ACK fix. Added a decrementReference in SubscriptionImpl after ↵Martin Ritchie2007-09-141-1/+6
| | | | | | | | | the message has been sent. This was previously done inside dequeueMessage() but when the reference counting was reworked earlier in the year it was moved out of that method.. but all the uses of dequeueMessage were not evaluated. The existing AckTest didon't detect this error as it only occurs with persistent messages which the client sends by default. The AckTest however only tests transient messages. Updated Test for NO_ACK raised JIRA QPID-602 to cover updating the rest of the AckTests (Updated log to show correct JIRA QPID-531 not QPID-573) git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@575811 13f79535-47bb-0310-9956-ffa450edef68
* QPID-572 Corrected patch for ConcurrentSelectorDeliveryManager that resolves ↵Martin Ritchie2007-09-141-1/+1
| | | | | | the ordering problem. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@575738 13f79535-47bb-0310-9956-ffa450edef68
* QPID-572 Applied test patch supplied by Aidan Skinner along with change to ↵Martin Ritchie2007-09-121-1/+7
| | | | | | ConcurrentSelectorDeliveryManager that resolves the ordering problem. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@574902 13f79535-47bb-0310-9956-ffa450edef68
* QPID-582 Fixing build on Java 6Robert Greig2007-09-111-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@574504 13f79535-47bb-0310-9956-ffa450edef68
* Merged changes to perftest code from M2 branch.Rupert Smith2007-08-233-242/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.0.1@568924 13f79535-47bb-0310-9956-ffa450edef68
* Fix for a bug in the Broker Tools, preventing them working.Martin Ritchie2007-08-015-14/+56
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@561794 13f79535-47bb-0310-9956-ffa450edef68
* AMQMessage - added //todo-s and removed unused parameter StoreContext from ↵Martin Ritchie2007-07-254-34/+32
| | | | | | | | expired() method call. ConcurrentSelectorDeliveryManager - Update to reflect expired() call change. Created new _reaperContextStore to be used when performing reaper operations such as message dequeue due to expiration. Removed old commented code. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@559427 13f79535-47bb-0310-9956-ffa450edef68
* Refactored interop tests into general distributed test framework. Moved ↵Rupert Smith2007-07-251-0/+1
| | | | | | 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-1814-474/+174
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@557306 13f79535-47bb-0310-9956-ffa450edef68
* QPID-541 A large portion of memory was being wasted in 32k ByteBuffers being ↵Martin Ritchie2007-07-175-7/+38
| | | | | | | | | 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
* Change to allow the management port to be specified on the command line, via ↵Martin Ritchie2007-07-172-48/+85
| | | | | | -m or --mport git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@556888 13f79535-47bb-0310-9956-ffa450edef68
* White space & code formatting changeMartin Ritchie2007-07-171-5/+8
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@556871 13f79535-47bb-0310-9956-ffa450edef68
* QPID-540 Prevent NPE when purging message from the main _message queue in ↵Martin Ritchie2007-07-173-56/+135
| | | | | | the ConcurrentSelectorDeliveryManager that have been delivered via a Subscribers _messageQueue. Ensuring that any expired messages are still correctly handled. i.e. the Queue size/depth is reduced and the message correctly dequeued from the underlying store. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@556869 13f79535-47bb-0310-9956-ffa450edef68
* QPID-538 Check to ensure a duplicate binding is not created.Martin Ritchie2007-07-176-25/+61
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@556861 13f79535-47bb-0310-9956-ffa450edef68
* Update to the MessageStore Tool to provide Move and Purge functionality.Martin Ritchie2007-07-175-138/+247
| | | | | | Updated to remove the AMQExceptions that will be removed from the Exchange class. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@556847 13f79535-47bb-0310-9956-ffa450edef68
* Additional logging in case of broker failure at startup.Martin Ritchie2007-07-171-1/+4
| | | | | | Use broker logger at error level as well as System.out git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@556845 13f79535-47bb-0310-9956-ffa450edef68
* QPID-537 : Make AMQMessage.incrementReference publicRobert Godfrey2007-07-161-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@556628 13f79535-47bb-0310-9956-ffa450edef68
* Added message copy method.Rupert Smith2007-07-101-19/+83
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@554964 13f79535-47bb-0310-9956-ffa450edef68
* Forgot to compile before committing. Missed a method change in the Select ↵Martin Ritchie2007-07-051-1/+1
| | | | | | command. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@553482 13f79535-47bb-0310-9956-ffa450edef68
* Minor changes and tidy up when running via command line.Martin Ritchie2007-07-058-46/+233
| | | | | | Added Copy command. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@553480 13f79535-47bb-0310-9956-ffa450edef68
* Tidied up some extranious logging.Martin Ritchie2007-07-043-44/+42
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@553265 13f79535-47bb-0310-9956-ffa450edef68
* Addition of the MessageStore Tool.Martin Ritchie2007-07-0432-65/+3944
| | | | | | | | | | Small changes to the Exchanges to allow the extraction of currently listed items. Extracted initial broker configuration mechanism to a reusable class. Have modified broker to use it. Move the Passwd.java to new tools package structure on the broker. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@553248 13f79535-47bb-0310-9956-ffa450edef68
* Messages moved by management console now commited on the message store.Rupert Smith2007-07-042-102/+125
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@553172 13f79535-47bb-0310-9956-ffa450edef68
* Added some documentation.Rupert Smith2007-07-022-226/+348
| | | | git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@552499 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status