Commit Graph

1298 Commits

Author SHA1 Message Date
Robert Davies b88db246b5 synchronization changes
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@509912 13f79535-47bb-0310-9956-ffa450edef68
2007-02-21 06:17:17 +00:00
Robert Davies 8613f58d16 tidy imports
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@509903 13f79535-47bb-0310-9956-ffa450edef68
2007-02-21 05:54:32 +00:00
Robert Davies f92e5b587a repeater test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@509731 13f79535-47bb-0310-9956-ffa450edef68
2007-02-20 20:09:23 +00:00
Robert Davies 5da043be84 testlets of performance
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@509729 13f79535-47bb-0310-9956-ffa450edef68
2007-02-20 20:08:05 +00:00
Robert Davies 32a4c47204 small op
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@509728 13f79535-47bb-0310-9956-ffa450edef68
2007-02-20 20:05:00 +00:00
Robert Davies 76c466ddef small op
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@509720 13f79535-47bb-0310-9956-ffa450edef68
2007-02-20 19:40:20 +00:00
Robert Davies 341a1d4753 small op
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@509717 13f79535-47bb-0310-9956-ffa450edef68
2007-02-20 19:25:30 +00:00
James Strachan b006e61e4f Handle duplicate destinations & concurrency issues better
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@509706 13f79535-47bb-0310-9956-ffa450edef68
2007-02-20 18:59:02 +00:00
James Strachan bca88fee18 Used toString() on destinations to avoid issues with StompConnect
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@509705 13f79535-47bb-0310-9956-ffa450edef68
2007-02-20 18:58:34 +00:00
Robert Davies f5b1b831b6 set stats collection to false by default - a real performance hog - ironically
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@509612 13f79535-47bb-0310-9956-ffa450edef68
2007-02-20 15:40:08 +00:00
Robert Davies c74558bfde Add some additional crude throttling. With cursors being limited by how much they can
can page into memory as well as the producer, you can get live locks around space usage -
if the allocation reaches 100%

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@509575 13f79535-47bb-0310-9956-ffa450edef68
2007-02-20 14:26:27 +00:00
Robert Davies b0b602121e set the prefetch to something sensible (this is actually a key bit!)
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@509566 13f79535-47bb-0310-9956-ffa450edef68
2007-02-20 14:01:55 +00:00
Robert Davies d0beb32cb8 add waiting to aquire a lock held by the store
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@509565 13f79535-47bb-0310-9956-ffa450edef68
2007-02-20 14:01:18 +00:00
Robert Davies b9814c408c only set the initialized flag = true after obtaining the lock on the data files
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@509564 13f79535-47bb-0310-9956-ffa450edef68
2007-02-20 14:00:35 +00:00
Robert Davies c46003fd3b tighten up on message reference counting
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@509563 13f79535-47bb-0310-9956-ffa450edef68
2007-02-20 13:59:41 +00:00
Robert Davies 8de60cf980 try to deliver messages if there's enough space
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@509552 13f79535-47bb-0310-9956-ffa450edef68
2007-02-20 13:22:27 +00:00
Robert Davies 3a2caf427d by default, there should not be a subscription recovery policy (and it leaks memory)
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@509550 13f79535-47bb-0310-9956-ffa450edef68
2007-02-20 13:20:40 +00:00
Robert Davies 40f5aadcd3 Add test case for slow durable consumer
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@509534 13f79535-47bb-0310-9956-ffa450edef68
2007-02-20 12:31:15 +00:00
Robert Davies 7b317ba7ad Log the error that caused the rollback
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@509486 13f79535-47bb-0310-9956-ffa450edef68
2007-02-20 09:58:34 +00:00
Robert Davies a5f74d673d remove unused line of code (it was bad anyway!)
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@509227 13f79535-47bb-0310-9956-ffa450edef68
2007-02-19 15:48:38 +00:00
James Strachan a3b3a497fb added fix for AMQ-1161
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@509200 13f79535-47bb-0310-9956-ffa450edef68
2007-02-19 13:45:34 +00:00
Robert Davies 0cda6b0d58 fix some synchronization problems
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@509115 13f79535-47bb-0310-9956-ffa450edef68
2007-02-19 06:56:59 +00:00
Robert Davies 0384cabd9d for getValue() ensure the StoreEntry is up to date
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@508721 13f79535-47bb-0310-9956-ffa450edef68
2007-02-17 07:30:08 +00:00
Robert Davies 6ac27998aa for getValue() ensure the StoreEntry is up to date
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@508719 13f79535-47bb-0310-9956-ffa450edef68
2007-02-17 07:10:03 +00:00
Robert Davies c8e6ff245b ObjectMarshaller cannot write to stream directly - it'll get corrupted
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@508534 13f79535-47bb-0310-9956-ffa450edef68
2007-02-16 18:56:11 +00:00
James Strachan 1a33eb61fb added support for temporary destinations and support more polymorphic request/reply logic in clients
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@508489 13f79535-47bb-0310-9956-ffa450edef68
2007-02-16 16:54:00 +00:00
Jonas B. Lim ee64b03ff5 patch for https://issues.apache.org/activemq/browse/AMQ-1163
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@507792 13f79535-47bb-0310-9956-ffa450edef68
2007-02-15 02:58:58 +00:00
Hiram R. Chirino 141b0faedb Fixed The StoreTest that was failing on windows due to file handles not being properly closed.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@507736 13f79535-47bb-0310-9956-ffa450edef68
2007-02-14 23:05:04 +00:00
Hiram R. Chirino 6ddca19690 Fix for failing MapContainerTest on windows. All file handles were not being closed on a Store.close() call.
also updated to make more use of generics.




git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@507717 13f79535-47bb-0310-9956-ffa450edef68
2007-02-14 22:23:04 +00:00
Jonas B. Lim ccf3f3c60d updates for https://issues.apache.org/activemq/browse/AMQ-894 - provided option to disable statistics gathering
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@506415 13f79535-47bb-0310-9956-ffa450edef68
2007-02-12 11:20:05 +00:00
Robert Davies a324484867 amq store - just like the quick store (cut n' paste) - difference is optimizations for recoverying in flight messages
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@504999 13f79535-47bb-0310-9956-ffa450edef68
2007-02-08 18:46:54 +00:00
Robert Davies ee4bb53a7d tell the PendingMessageCursor how many messages you want - for more efficent polling from store
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@504798 13f79535-47bb-0310-9956-ffa450edef68
2007-02-08 05:55:56 +00:00
James Strachan 1d882e981c adding a patch to fix AMQ-1157 allowing a broker security context to be used to allow destinations to be created on startup etc.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@504586 13f79535-47bb-0310-9956-ffa450edef68
2007-02-07 15:35:10 +00:00
Robert Davies 6e7e3abf5d fix some problems in Quick Journal - now message containers are using Kaha maps instead of lists
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@504501 13f79535-47bb-0310-9956-ffa450edef68
2007-02-07 11:12:53 +00:00
James Strachan 3b78804dbc fix text case by disabling spooling to disk
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@504228 13f79535-47bb-0310-9956-ffa450edef68
2007-02-06 18:06:25 +00:00
Robert Davies 5c7af47332 make sure next entry will be set properly in recovery
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@504032 13f79535-47bb-0310-9956-ffa450edef68
2007-02-06 08:40:14 +00:00
Robert Davies 2e0f676c9b see http://www.nabble.com/ActiveMQConnection.createConnectionConsumer-bug--tf3159712.html#a8819449
properties not being set correctly

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@504023 13f79535-47bb-0310-9956-ffa450edef68
2007-02-06 08:23:38 +00:00
Robert Davies fb3f71d895 ensure writer isn't null in removeDataFile()
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@504007 13f79535-47bb-0310-9956-ffa450edef68
2007-02-06 06:27:11 +00:00
Robert Davies aa18c5d6fc ensure that init() is called on index - before clearing the index
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@503856 13f79535-47bb-0310-9956-ffa450edef68
2007-02-05 20:31:17 +00:00
Robert Davies c4c9f0b983 use Kaha MapContainer for message storage instead of the Kaha ListContainer
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@503694 13f79535-47bb-0310-9956-ffa450edef68
2007-02-05 14:15:36 +00:00
Robert Davies ee9f05ea52 use Kaha MapContainer for message storage instead of the Kaha ListContainer
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@503681 13f79535-47bb-0310-9956-ffa450edef68
2007-02-05 13:58:15 +00:00
Robert Davies 0859f30a91 use Kaha MapContainer for message storage instead of the Kaha ListContainer
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@503680 13f79535-47bb-0310-9956-ffa450edef68
2007-02-05 13:57:43 +00:00
Robert Davies 5b49189cfe Tidy up the choice of Index types for the Map and List container
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@503177 13f79535-47bb-0310-9956-ffa450edef68
2007-02-03 07:24:10 +00:00
Robert Davies 93c67fe701 Addition of Indexes based on BTree and Hashing
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@503176 13f79535-47bb-0310-9956-ffa450edef68
2007-02-03 06:53:59 +00:00
Hiram R. Chirino be35271fdc Port of rev 501500 fix for https://issues.apache.org/activemq/browse/AMQ-1140
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@501506 13f79535-47bb-0310-9956-ffa450edef68
2007-01-30 18:24:29 +00:00
Robert Davies b54ff7acff Updated support for configurable Cursor types from the Destination Policy Map
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@500863 13f79535-47bb-0310-9956-ffa450edef68
2007-01-28 19:39:30 +00:00
Robert Davies 0c0be94a31 Updated support for configurable Cursor types from the Destination Policy Map
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@500862 13f79535-47bb-0310-9956-ffa450edef68
2007-01-28 19:39:02 +00:00
Robert Davies f0d9464da0 remove the caching (as was causing memory leaks) in the ListContainer
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@499827 13f79535-47bb-0310-9956-ffa450edef68
2007-01-25 16:20:42 +00:00
Robert Davies 10abf6727a fix for http://issues.apache.org/activemq/browse/AMQ-1082
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@499798 13f79535-47bb-0310-9956-ffa450edef68
2007-01-25 13:58:38 +00:00
Robert Davies fb56fd9c76 fix for http://issues.apache.org/activemq/browse/AMQ-1082
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@499797 13f79535-47bb-0310-9956-ffa450edef68
2007-01-25 13:58:02 +00:00
Robert Davies b036d4d2fa fix for memory leaks woth non-persistent messages - see http://www.nabble.com/OutOfMemoryErrors-again-tf3083798.html
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@499760 13f79535-47bb-0310-9956-ffa450edef68
2007-01-25 12:23:57 +00:00
Robert Davies 1b8148cd37 increase average size overhead of a message to 500 bytes
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@499758 13f79535-47bb-0310-9956-ffa450edef68
2007-01-25 12:19:40 +00:00
Robert Davies 0552f4a1b0 change log level to debug for exceptio thrown when disposing of local transport
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@499752 13f79535-47bb-0310-9956-ffa450edef68
2007-01-25 11:54:12 +00:00
Robert Davies 22e007f0a3 log when transport reconnects successfully
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@499746 13f79535-47bb-0310-9956-ffa450edef68
2007-01-25 11:41:42 +00:00
Robert Davies af249b6b86 use different broker names for the remote and local broker
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@499478 13f79535-47bb-0310-9956-ffa450edef68
2007-01-24 16:56:43 +00:00
Robert Davies 30716b1519 add synchronize around pending
- see http://www.nabble.com/Is-anyone-else-seeing-messages-stuck-on-a-queue--tf3027911.html#a8550623


git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@499173 13f79535-47bb-0310-9956-ffa450edef68
2007-01-23 22:50:15 +00:00
Robert Davies 21391ceab4 add synchronize around add() - see http://www.nabble.com/Is-anyone-else-seeing-messages-stuck-on-a-queue--tf3027911.html#a8550623
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@499169 13f79535-47bb-0310-9956-ffa450edef68
2007-01-23 22:38:12 +00:00
Robert Davies 1a448be825 applied patch for http://issues.apache.org/activemq/browse/AMQ-1077
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@499032 13f79535-47bb-0310-9956-ffa450edef68
2007-01-23 14:29:26 +00:00
Robert Davies 28a7312f2e corrected spelling mistake in raised exception
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@498926 13f79535-47bb-0310-9956-ffa450edef68
2007-01-23 05:55:24 +00:00
James Strachan 0aac7f5d5c fix for AMQ-1134 so that stomp connections are cleared up by the broker if a stomp client is killed without disconnecting properly
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@497898 13f79535-47bb-0310-9956-ffa450edef68
2007-01-19 18:36:41 +00:00
James Strachan 6e26195cd8 fix for AMQ-1130 to use LONGBLOB rather than BLOB for persisting on mysql to avoid the 64k limit
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@496976 13f79535-47bb-0310-9956-ffa450edef68
2007-01-17 09:37:36 +00:00
Jonas B. Lim f490982c38 updated patch for https://issues.apache.org/activemq/browse/AMQ-1010
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@496571 13f79535-47bb-0310-9956-ffa450edef68
2007-01-16 02:05:48 +00:00
Robert Davies f19a3a66d6 Tidied up the async dispatch option
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@494950 13f79535-47bb-0310-9956-ffa450edef68
2007-01-10 19:40:33 +00:00
Robert Davies 79f326ad53 ignoring the mutex for shutdown causes sporadic failures in open-wire
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@494331 13f79535-47bb-0310-9956-ffa450edef68
2007-01-09 06:51:17 +00:00
Robert Davies e349089a8d Fix for http://issues.apache.org/activemq/browse/AMQ-1117
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@493696 13f79535-47bb-0310-9956-ffa450edef68
2007-01-07 10:43:38 +00:00
Robert Davies e76feb6b8e fix for http://issues.apache.org/activemq/browse/AMQ-1119
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@493573 13f79535-47bb-0310-9956-ffa450edef68
2007-01-06 21:15:01 +00:00
Hiram R. Chirino 8e8b82024b Adding an intial cut of an NIO based Transport. This could be really hand to help brokers scale up in situations where it needs to accecpt a large number of connections.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@493241 13f79535-47bb-0310-9956-ffa450edef68
2007-01-05 23:23:14 +00:00
Hiram R. Chirino e30a9dddde Added a JPA based ReferenceStoreAdapter implementation
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@493226 13f79535-47bb-0310-9956-ffa450edef68
2007-01-05 23:05:40 +00:00
Hiram R. Chirino c1612b5e06 moving to the activemq-jpa-module.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@493196 13f79535-47bb-0310-9956-ffa450edef68
2007-01-05 21:25:15 +00:00
Robert Davies f89d4dcaeb guard against MessageEvaluationContext dropping the message whilst doing the check
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@493032 13f79535-47bb-0310-9956-ffa450edef68
2007-01-05 13:39:42 +00:00
Robert Davies aebb18cc57 increase the default cache size
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@492995 13f79535-47bb-0310-9956-ffa450edef68
2007-01-05 11:49:09 +00:00
Robert Davies d2bff5d8ed might as well use the generic stuff - sigh
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@492994 13f79535-47bb-0310-9956-ffa450edef68
2007-01-05 11:48:37 +00:00
Robert Davies 720a19c5bf optimization for large number of queue consumers
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@492993 13f79535-47bb-0310-9956-ffa450edef68
2007-01-05 11:47:49 +00:00
Hiram R. Chirino a664b0b917 Quick Store bug fixes and added a bench mark test
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@492518 13f79535-47bb-0310-9956-ffa450edef68
2007-01-04 11:00:45 +00:00
Hiram R. Chirino 88eab92328 Quick Store bug fixes and added a bench mark test
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@492517 13f79535-47bb-0310-9956-ffa450edef68
2007-01-04 11:00:31 +00:00
Hiram R. Chirino ced50c9940 Quick store bug fixes.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@492511 13f79535-47bb-0310-9956-ffa450edef68
2007-01-04 10:39:04 +00:00
Hiram R. Chirino 62c850b7de rollback change.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@492474 13f79535-47bb-0310-9956-ffa450edef68
2007-01-04 09:38:09 +00:00
Hiram R. Chirino a4c432ab45 Fixed a ton of Quick store bugs that were found when running the QuickStoreLoadTester.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@492472 13f79535-47bb-0310-9956-ffa450edef68
2007-01-04 09:36:07 +00:00
Hiram R. Chirino 75b1c94ddc Fixed a ton of Quick store bugs that were found when running the QuickStoreLoadTester.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@492471 13f79535-47bb-0310-9956-ffa450edef68
2007-01-04 09:34:46 +00:00
Robert Davies 158dbc66e7 go back to less granular synchronization
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@492461 13f79535-47bb-0310-9956-ffa450edef68
2007-01-04 08:59:12 +00:00
Hiram R. Chirino 481fc1ee3a - Big refactor of the QuickJournal:
- Move it to it's own package org.apache.activemq.store.quick
  - Brought in all the latest JournalPersistenceAdaptor enhancements
  - It now uses the AsyncDataManager as the Journal implemenation which has better read performance
  - Instead of forcing all PersistenceAdaptors to support external references, we now move all the message reference methods to a new set of interface class (MesageReferenceAdaptor)
  - Enhanced a few Kaha container classes so that they take advantage of Generics
  - Added a Kaha based MesageReferenceAdaptor impementation
  - Strategy for deleting old journal log files is now in place so that disk space can be reclaimed.


git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@492380 13f79535-47bb-0310-9956-ffa450edef68
2007-01-04 01:48:20 +00:00
Hiram R. Chirino 0afb7f934f - Big refactor of the QuickJournal:
- Move it to it's own package org.apache.activemq.store.quick
  - Brought in all the latest JournalPersistenceAdaptor enhancements
  - It now uses the AsyncDataManager as the Journal implemenation which has better read performance
  - Instead of forcing all PersistenceAdaptors to support external references, we now move all the message reference methods to a new set of interface class (MesageReferenceAdaptor)
  - Enhanced a few Kaha container classes so that they take advantage of Generics
  - Added a Kaha based MesageReferenceAdaptor impementation
  - Strategy for deleting old journal log files is now in place so that disk space can be reclaimed.


git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@492373 13f79535-47bb-0310-9956-ffa450edef68
2007-01-04 00:57:03 +00:00
Robert Davies 61d56b290a in stop() remove VMTransports after services stopped - to avoid a timing issue with
discovery spinning up a new instance

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491856 13f79535-47bb-0310-9956-ffa450edef68
2007-01-02 17:13:54 +00:00
Robert Davies 81c5b1500b in stop() remove VMTransports after services stopped - to avoid a timing issue with
discovery spinning up a new instance

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491794 13f79535-47bb-0310-9956-ffa450edef68
2007-01-02 13:39:10 +00:00
Robert Davies 4cd0a27f91 Fix for https://issues.apache.org/activemq/browse/AMQ-1110
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491753 13f79535-47bb-0310-9956-ffa450edef68
2007-01-02 07:06:39 +00:00
Hiram R. Chirino 3070d33275 Wait the perfect amount of time by using count down latches.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491455 13f79535-47bb-0310-9956-ffa450edef68
2006-12-31 17:33:56 +00:00
Hiram R. Chirino a810f4300a Fix RecoveryBrokerTest that I messed up :)
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491452 13f79535-47bb-0310-9956-ffa450edef68
2006-12-31 17:32:40 +00:00
Robert Davies b91103a830 sp mistake in log
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491432 13f79535-47bb-0310-9956-ffa450edef68
2006-12-31 15:36:43 +00:00
Robert Davies 6ddeac7bc0 check we are not a slaveBroker() when dispatching
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491431 13f79535-47bb-0310-9956-ffa450edef68
2006-12-31 15:35:38 +00:00
Hiram R. Chirino 7695676339 Fix for CursorDurableTest.
The TopicStorePrefetch was iterating items that were in the subscription but not added to the pending list.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491346 13f79535-47bb-0310-9956-ffa450edef68
2006-12-30 23:49:03 +00:00
Robert Davies 2a682e2fb2 Applied patch from: https://issues.apache.org/activemq/browse/AMQ-961
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491185 13f79535-47bb-0310-9956-ffa450edef68
2006-12-30 07:27:06 +00:00
Robert Davies 7351c4bd0d clear batch entry if no more messages in the container
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491184 13f79535-47bb-0310-9956-ffa450edef68
2006-12-30 07:25:03 +00:00
Robert Davies fe3f492321 fixed class cast exception
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491128 13f79535-47bb-0310-9956-ffa450edef68
2006-12-29 23:01:39 +00:00
Robert Davies 71e44ce436 put back using kaha as persistent adaptor
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491093 13f79535-47bb-0310-9956-ffa450edef68
2006-12-29 20:27:00 +00:00
Robert Davies 3d0191e29e clear batch entry if no more messages in the container
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491092 13f79535-47bb-0310-9956-ffa450edef68
2006-12-29 20:25:58 +00:00
Robert Davies 8bc7f8636c clear batch entry if no more messages in the container
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491090 13f79535-47bb-0310-9956-ffa450edef68
2006-12-29 20:24:11 +00:00
Robert Davies cd687e389c clear last batch id if no more messages left to dispatch to a durable subscriber
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491089 13f79535-47bb-0310-9956-ffa450edef68
2006-12-29 20:21:10 +00:00
Robert Davies 8b0f88a257 put the synchronization back for now
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@491088 13f79535-47bb-0310-9956-ffa450edef68
2006-12-29 20:19:25 +00:00
Robert Davies d7a9feb0a6 Fix for http://issues.apache.org/activemq/browse/AMQ-1113
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490967 13f79535-47bb-0310-9956-ffa450edef68
2006-12-29 09:28:01 +00:00
Robert Davies d2e606208d Use the store based cursor by default for Queues - which will enable very large queue support
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490814 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 21:03:53 +00:00
Robert Davies 6964747912 updated recoverNextMessages()
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490813 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 21:02:44 +00:00
Robert Davies a70f96bd37 set the basedir property - so can be run from inside eclipse
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490808 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 21:01:21 +00:00
Robert Davies 63d78acccc tidy up the tests
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490807 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 21:00:36 +00:00
Robert Davies 81920f61cc setPersistent() call has no affect when using XBeanBrokerFactory - start is already called
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490805 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 21:00:05 +00:00
Robert Davies 17f8a7ebcc use memory based persistence for this test
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490804 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 20:58:36 +00:00
Robert Davies 5b33fefd41 persistent not used - but needs to be set in config - as only has affect before
start is called on the broker (which happens automatically via afterPropertiesSet())

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490800 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 20:57:17 +00:00
Robert Davies 974ec34df5 add a little more stress to the testManyProducersManyConsumers() test
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490798 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 20:55:56 +00:00
Robert Davies e5efc58cd4 Added support for hasMessagesToDeliver() method
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490796 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 20:52:41 +00:00
Robert Davies 4a16f4527a Transactions, when recovered, need to be recovered in prepare order:
a)  order determined by an unsorted map iterator might confuse people
b) brokerSequence can get out of step for messages recovered then committed - e.g. 
recovery on startup

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490795 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 20:51:22 +00:00
Robert Davies b1c94aa00b Provide a more robust implementation, and one that deletes messages after they have been consumed
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490794 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 20:50:04 +00:00
Robert Davies 3093ea0f6e Transactions, when recovered, need to be recovered in prepare order:
a)  order determined by an unsorted map iterator might confuse people
b) brokerSequence can get out of step for messages recovered then committed - e.g. 
recovery on startup

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490792 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 20:48:04 +00:00
Robert Davies 27ded73ca6 drop synchronization from connectionState and connection context -
not required when using ConcurrentHashMap and limited concurrency for 
publishers or transactions for the same client connection 

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490789 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 20:44:59 +00:00
Robert Davies bc03f37ebe Fix for http://issues.apache.org/activemq/browse/AMQ-841
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490786 13f79535-47bb-0310-9956-ffa450edef68
2006-12-28 20:29:34 +00:00
Robert Davies 63ec479423 forgot to remove the sophisticated debuging code - oops
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490454 13f79535-47bb-0310-9956-ffa450edef68
2006-12-27 07:43:43 +00:00
Robert Davies de64939643 somehow, somewhere, the ResponseCorrelator got dropped from the transport used by the
MasterBroker - so I've added it back here

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490452 13f79535-47bb-0310-9956-ffa450edef68
2006-12-27 07:40:13 +00:00
Robert Davies ef0b33eeb6 uses cases submitted by Brian Diesenhaus
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490319 13f79535-47bb-0310-9956-ffa450edef68
2006-12-26 16:14:14 +00:00
Robert Davies e6a418b13b check we don't through null pointer exceptions - as this can lead to stack overflows ...
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490174 13f79535-47bb-0310-9956-ffa450edef68
2006-12-25 21:05:57 +00:00
Robert Davies c651ace525 it's ensure dispatching happens in order
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490111 13f79535-47bb-0310-9956-ffa450edef68
2006-12-25 07:19:29 +00:00
Robert Davies d8674a0fed fix for http://issues.apache.org/activemq/browse/AMQ-1108
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490007 13f79535-47bb-0310-9956-ffa450edef68
2006-12-24 08:57:34 +00:00
Adrian T. Co 2b903d446a Fix for AMQ-1106: PooledBrokerFactoryBean incorrectly compares broker config resources
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@489413 13f79535-47bb-0310-9956-ffa450edef68
2006-12-21 17:17:19 +00:00
Robert Davies 958c41a12b stop destinations when stoping a region
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@488958 13f79535-47bb-0310-9956-ffa450edef68
2006-12-20 08:33:50 +00:00
Robert Davies f6972ec84a remove println messages from remove()
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@488783 13f79535-47bb-0310-9956-ffa450edef68
2006-12-19 19:41:41 +00:00
James Strachan 419ed2ee91 Patch for AMQ-1093 to avoid a deadlock if the transport is being reconnected from inside a MessageListener which is calling a send(), lets make the explicit clear of the consumer dispatch list asynchronous and within the existing mutex
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@487235 13f79535-47bb-0310-9956-ffa450edef68
2006-12-14 15:23:47 +00:00
Robert Davies e500f2ecc4 synchronize around the send on a Message
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@487232 13f79535-47bb-0310-9956-ffa450edef68
2006-12-14 15:18:25 +00:00
Adrian T. Co 87d15d6b98 https://issues.apache.org/activemq/browse/AMQ-1097
- Fix for selector configured using destination options is not set
- Test case to demonstrate issue

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@487187 13f79535-47bb-0310-9956-ffa450edef68
2006-12-14 12:25:49 +00:00
Guillaume Nodet 747acfef69 Fix exception when removing message from MemoryMessageStore
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@486382 13f79535-47bb-0310-9956-ffa450edef68
2006-12-12 22:46:51 +00:00
Jonas B. Lim 16546f951a added fix for https://issues.apache.org/activemq/browse/AMQ-908
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@486131 13f79535-47bb-0310-9956-ffa450edef68
2006-12-12 13:19:03 +00:00
Guillaume Nodet 870401217a AMQ-1084: Allow o.a.a.pool to support XA transactions
Also enhance the pooled ConnectionFactory to reuse several connections.
Fix the lastUsed timestamp on the ConnectionPool to avoid discarding reusable connections.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@481742 13f79535-47bb-0310-9956-ffa450edef68
2006-12-03 09:24:55 +00:00
Robert Davies f1a989da9e sp mistake
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@480925 13f79535-47bb-0310-9956-ffa450edef68
2006-11-30 13:47:48 +00:00
Robert Davies 415d46cf46 log which Persistence Adaptor we are using
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@480924 13f79535-47bb-0310-9956-ffa450edef68
2006-11-30 13:46:08 +00:00
Robert Davies 4597dddf79 Setting the Store based cursor as the default for Durable Subscribers
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@480731 13f79535-47bb-0310-9956-ffa450edef68
2006-11-29 22:09:33 +00:00
Hiram R. Chirino 789d4e5541 Fix for http://issues.apache.org/activemq/browse/AMQ-1078
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@480717 13f79535-47bb-0310-9956-ffa450edef68
2006-11-29 21:26:23 +00:00
Jonas B. Lim 346119bfc4 applied patch for http://issues.apache.org/activemq/browse/AMQ-908
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@480575 13f79535-47bb-0310-9956-ffa450edef68
2006-11-29 14:08:36 +00:00
Robert Davies d871d0e304 ensure container is initialized before accessing
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@480416 13f79535-47bb-0310-9956-ffa450edef68
2006-11-29 05:36:42 +00:00
Robert Davies 5c587a2f13 Ensure store is properly deleted, even if not initialized
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@480185 13f79535-47bb-0310-9956-ffa450edef68
2006-11-28 20:08:26 +00:00
James Strachan ed1537b79d Added support for JDBC Master Slave for MySQL for AMQ-1074 thanks to the kind patch from Steve Lotito
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@480072 13f79535-47bb-0310-9956-ffa450edef68
2006-11-28 14:47:05 +00:00
James Strachan 935fde0377 added a test case to try reproduce bug AMQ-1054 (unfortunately it doesnt) - also added a patch to try fix AMQ-1054 based on the kind suggestion from Shoaib Akhtar that it could be the cast from getData() causing the ClassCastException; so AMQ-1054 may be fixed but as yet we don't have a test case to prove it
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@479726 13f79535-47bb-0310-9956-ffa450edef68
2006-11-27 19:01:37 +00:00
James Strachan 4f7aeecc1e added support for AMQ-1073 to allow selectors to be used with virtual destinations
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@479694 13f79535-47bb-0310-9956-ffa450edef68
2006-11-27 17:16:33 +00:00
Jonas B. Lim e78e72f957 updates for http://issues.apache.org/activemq/browse/AMQ-795
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@479639 13f79535-47bb-0310-9956-ffa450edef68
2006-11-27 14:35:34 +00:00
Robert Davies a11060452b support for durable store cursors and retroactive subscribers
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@479614 13f79535-47bb-0310-9956-ffa450edef68
2006-11-27 13:40:11 +00:00
Robert Davies ec63977e81 Tidied up locking around cursor iterators
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@479156 13f79535-47bb-0310-9956-ffa450edef68
2006-11-25 17:58:41 +00:00
Hiram R. Chirino 6e3bb5d682 Moved the new JPA module to it's own directory.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@479145 13f79535-47bb-0310-9956-ffa450edef68
2006-11-25 16:56:12 +00:00
Robert Davies 9359e9f6ca Update to fix http://issues.apache.org/activemq/browse/AMQ-791
Use in mmeory list in FilePendingMessageCursor - until memory limit reached - then use disk.
USe FilePendingMessageCursor in TopicSubscription instead of LinkedList

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@479094 13f79535-47bb-0310-9956-ffa450edef68
2006-11-25 07:10:17 +00:00
Hiram R. Chirino 118c806907 Added a new org.apache.activemq.kaha.impl.asyc package that holds data manager/journal that implements both the Kaha DataManager and ActiveIO Journal interfaces.
- Initial bench marks show it to be as fast or faster than the default ActiveIO Journal.
- The bigest differentiator is that this implementation of the journal was built to also provide fast reads.
- The DataManager interface was extracted and now the KahaStore can switch between the original DataManager implementation and the new implementation in the kaha.impl.async packagge.
- Simplified the original implementation by removing the AsyncDataWriters stuff since this is largely what the new package is based on.



git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@479089 13f79535-47bb-0310-9956-ffa450edef68
2006-11-25 06:00:56 +00:00
Robert Davies 3bf0245e76 implementation of store based cursors for Queues and Durable Subscribers,
to fix:
http://issues.apache.org/activemq/browse/AMQ-845
http://issues.apache.org/activemq/browse/AMQ-1062
http://issues.apache.org/activemq/browse/AMQ-1061
http://issues.apache.org/activemq/browse/AMQ-493
http://issues.apache.org/activemq/browse/AMQ-914

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@478967 13f79535-47bb-0310-9956-ffa450edef68
2006-11-24 19:57:51 +00:00
Robert Davies be6fac15e2 setter for max duration
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@478598 13f79535-47bb-0310-9956-ffa450edef68
2006-11-23 15:30:34 +00:00
Frederick G. Oconer d81997d3eb AMQ-526: get TwoBrokerMulticastQueueTest to work.
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@478558 13f79535-47bb-0310-9956-ffa450edef68
2006-11-23 13:07:33 +00:00
Robert Davies e00678027f support for different message storage cursor types for Queue destination policies
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@478509 13f79535-47bb-0310-9956-ffa450edef68
2006-11-23 08:19:00 +00:00
James Strachan 9e02c22529 Removed unnecessary System.out
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@478325 13f79535-47bb-0310-9956-ffa450edef68
2006-11-22 21:21:02 +00:00
James Strachan eb827e2780 Added a fix for AMQ-1068 to avoid lots of RAM being used up with deeply nested topic hierarchies - we basically create the AnyChild nodes on demand now rather than up front
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@478324 13f79535-47bb-0310-9956-ffa450edef68
2006-11-22 21:19:21 +00:00