Commit Graph

4236 Commits

Author SHA1 Message Date
Gary Tully 8b85c30849 merge -c 906861 https://svn.apache.org/repos/asf/activemq/trunk - tidy up and enable auto fail as this hangs in 5.3 for some reason. stack trace will help diagnose
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@906864 13f79535-47bb-0310-9956-ffa450edef68
2010-02-05 09:17:48 +00:00
Bosanac Dejan 3db5d18a43 merging 906560 - https://issues.apache.org/activemq/browse/AMQ-2594 - reverting related https://issues.apache.org/activemq/browse/AMQ-2563 changes, as more refactoring is needed
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@906567 13f79535-47bb-0310-9956-ffa450edef68
2010-02-04 17:03:17 +00:00
Gary Tully dc70734b25 merge -c 904450 https://svn.apache.org/repos/asf/activemq/trunk - wait for queues to drain, intermittent failure
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@906451 13f79535-47bb-0310-9956-ffa450edef68
2010-02-04 11:11:07 +00:00
Bosanac Dejan 58d729f0f8 merging 906416 - https://issues.apache.org/activemq/browse/AMQ-2410 - fixing js errors
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@906418 13f79535-47bb-0310-9956-ffa450edef68
2010-02-04 09:39:17 +00:00
Bosanac Dejan 25fd052229 reverting 901832, 903487 - https://issues.apache.org/activemq/browse/AMQ-2571 - is not intended for 5.3 branch
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@906123 13f79535-47bb-0310-9956-ffa450edef68
2010-02-03 16:50:18 +00:00
Bosanac Dejan 159a52bd51 merging 903758 - resolve intermitent failure on loaded machines, consumer could complete before producer thread got to do any work at all
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@906104 13f79535-47bb-0310-9956-ffa450edef68
2010-02-03 16:13:46 +00:00
Robert Davies 37e1cdd4b9 upgraded to commons-pool 1.5.4
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@906096 13f79535-47bb-0310-9956-ffa450edef68
2010-02-03 15:51:30 +00:00
Bosanac Dejan 99d11b8e1c merging 906054 - https://issues.apache.org/activemq/browse/AMQ-2563 - jdbc memory leak
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@906069 13f79535-47bb-0310-9956-ffa450edef68
2010-02-03 14:36:39 +00:00
Timothy A. Bish 88fbea116d https://issues.apache.org/activemq/browse/AMQ-2196
Add option to ignore the values in the remote WireFormatInfo in case the user wants control over the Brokers inactivity timeouts.

git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@905779 13f79535-47bb-0310-9956-ffa450edef68
2010-02-02 20:20:59 +00:00
Gary Tully e0ce1d770d merge -c 905640 https://svn.apache.org/repos/asf/activemq/trunk - tidy up test case for https://issues.apache.org/activemq/browse/AMQ-2590
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@905641 13f79535-47bb-0310-9956-ffa450edef68
2010-02-02 14:18:54 +00:00
Gary Tully 2920f2e0b4 merge -c 904005 https://svn.apache.org/repos/asf/activemq/trunk - validate jetty availabilty via socket connect to take out the guess work on loaded machines - avoid connection refused intermittent failures
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@905593 13f79535-47bb-0310-9956-ffa450edef68
2010-02-02 11:55:13 +00:00
Gary Tully 3495a05a24 merge -c 905582 https://svn.apache.org/repos/asf/activemq/trunk - remove dependency on jmx and revert to direct calls on destinations to get stats and view on counters - resolve intermittent failures on hudson with a bit of luck as jmx introduces lots of timing issues
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@905590 13f79535-47bb-0310-9956-ffa450edef68
2010-02-02 11:44:42 +00:00
Gary Tully 2c414b7417 merge -c 833435 https://svn.apache.org/repos/asf/activemq/trunk - resolve intermittent failure of DiscoveryNetworkReconnectTest due to network timing issues
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@905442 13f79535-47bb-0310-9956-ffa450edef68
2010-02-01 23:08:00 +00:00
Gary Tully 9ba1eb1527 merge -c 905432 https://svn.apache.org/repos/asf/activemq/trunk - commit may throw a TransactionRolledBackException in the event that after a failover recovery, the same messages are not redispatched - the transaction cannot be fully recreated so it must rollback
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@905437 13f79535-47bb-0310-9956-ffa450edef68
2010-02-01 23:01:45 +00:00
Gary Tully aca25aa34c merge -c 905349 https://svn.apache.org/repos/asf/activemq/trunk - resolve: https://issues.apache.org/activemq/browse/AMQ-2589 - add null check
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@905376 13f79535-47bb-0310-9956-ffa450edef68
2010-02-01 19:13:13 +00:00
Bosanac Dejan 142a8ede92 merging 905235 - DurableConsumerTest - giving it more time to pass on slow machines
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@905236 13f79535-47bb-0310-9956-ffa450edef68
2010-02-01 10:17:36 +00:00
Gary Tully 888b3f8a7a merge -c 901911 https://svn.apache.org/repos/asf/activemq/trunk - fix for https://issues.apache.org/activemq/browse/AMQ-2548 don't close the ftp connection until the stream is closed.
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@905219 13f79535-47bb-0310-9956-ffa450edef68
2010-02-01 09:29:15 +00:00
Bosanac Dejan de15843269 merging 833497,835874,903487,903741,904451 - DurableConsumerTest failures
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@904505 13f79535-47bb-0310-9956-ffa450edef68
2010-01-29 14:14:38 +00:00
Bosanac Dejan f2fee78980 merge 904468 - https://issues.apache.org/activemq/browse/AMQ-2507 - improving test, avoiding false positives
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@904474 13f79535-47bb-0310-9956-ffa450edef68
2010-01-29 11:59:26 +00:00
Bosanac Dejan 0cb2f403b7 merging 904160 - https://issues.apache.org/activemq/browse/AMQ-2507 - producer flow control timeout
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@904171 13f79535-47bb-0310-9956-ffa450edef68
2010-01-28 17:22:27 +00:00
Bosanac Dejan 60a797c4b1 merging 903741 - intermittent failures of DurableConsumerTest
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@904139 13f79535-47bb-0310-9956-ffa450edef68
2010-01-28 15:45:55 +00:00
Robert Davies c0499c83b0 Fix for http://issues.apache.org/activemq/browse/AMQ-2530
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@903349 13f79535-47bb-0310-9956-ffa450edef68
2010-01-26 18:21:25 +00:00
Gary Tully 0a34fe63b6 svn merge -c 903180 https://svn.apache.org/repos/asf/activemq/trunk - instancenotfound exception wrapped in undeclaredthrowable by proxy, just ignore all for the wait period so slow machines can let it pass eventually
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@903186 13f79535-47bb-0310-9956-ffa450edef68
2010-01-26 11:47:42 +00:00
Bosanac Dejan 2d474b6c08 merging 903177 - DiscoveryNetworkReconnectTest - giving it even more time to reconnect to help stabilise on slow machines
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@903179 13f79535-47bb-0310-9956-ffa450edef68
2010-01-26 11:34:53 +00:00
Robert Davies b3c2a811ae Fix for https://issues.apache.org/activemq/browse/AMQ-2512
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@902999 13f79535-47bb-0310-9956-ffa450edef68
2010-01-25 22:22:44 +00:00
Bosanac Dejan 0dec0e79f2 merging 893834,899673,900850,901789,902134,902135,902728,902850 - https://issues.apache.org/activemq/browse/AMQ-2570 & https://issues.apache.org/activemq/browse/AMQ-2550 - osgi & karaf support
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@902867 13f79535-47bb-0310-9956-ffa450edef68
2010-01-25 16:42:52 +00:00
Bosanac Dejan 12b1bee333 merging 902816 - making ExpiredMessagesTest pass on very slow machines
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@902823 13f79535-47bb-0310-9956-ffa450edef68
2010-01-25 14:36:06 +00:00
Gary Tully bb98038a9c svn merge -c 902056 https://svn.apache.org/repos/asf/activemq/trunk - resolve intermittent failure of org.apache.activemq.bugs.AMQ2149Test as a result of https://issues.apache.org/activemq/browse/AMQ-2573. An new command to indicate when recovery is complete on a sub is needed to gate dispatch on a recovered connection, can do this for 5.4. An outstanding ack transaction is now ignored but an outstand send transaction can still cause a potential hang till we introduce the new recovery complete command
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@902057 13f79535-47bb-0310-9956-ffa450edef68
2010-01-22 11:01:53 +00:00
Bosanac Dejan 08efe64d74 merging 901626 - https://issues.apache.org/activemq/browse/AMQ-2574 - add repository for external spring dependencies
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@901630 13f79535-47bb-0310-9956-ffa450edef68
2010-01-21 10:00:39 +00:00
Gary Tully 5031408866 svn merge -c 901273 https://svn.apache.org/repos/asf/activemq/trunk - resolve https://issues.apache.org/activemq/browse/AMQ-2573 - rollback of audit check needs to be synced with redispatch after failover transport resumption, otherwise some redispatched unconsumed messages can get auto-acked as duplicates in error
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@901274 13f79535-47bb-0310-9956-ffa450edef68
2010-01-20 16:53:02 +00:00
Gary Tully 81415b5d1b svn merge -c 901269 https://svn.apache.org/repos/asf/activemq/trunk - resolve https://issues.apache.org/activemq/browse/AMQ-2567
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@901271 13f79535-47bb-0310-9956-ffa450edef68
2010-01-20 16:44:11 +00:00
Bosanac Dejan 078c1f5180 merging 816444 and 901171 - osgi support and https://issues.apache.org/activemq/browse/AMQ-2574 - stop osgi bundle on application context close
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@901177 13f79535-47bb-0310-9956-ffa450edef68
2010-01-20 13:11:59 +00:00
Gary Tully 8e74cc8fc9 merge -c 899145 https://svn.apache.org/repos/asf/activemq/trunk - add a few more test variants for inflight: https://issues.apache.org/activemq/browse/AMQ-2566
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@900391 13f79535-47bb-0310-9956-ffa450edef68
2010-01-18 13:21:38 +00:00
Gary Tully 97143be545 merge -c 898797 https://svn.apache.org/repos/asf/activemq/trunk - resolve https://issues.apache.org/activemq/browse/AMQ-2566, inflight out of sync after delivery to dlq. Also tidy failover transaction test from: https://issues.apache.org/activemq/browse/AMQ-2560
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@900390 13f79535-47bb-0310-9956-ffa450edef68
2010-01-18 13:19:27 +00:00
Bosanac Dejan a7da603c4f merging 900363 - DiscoveryNetworkReconnectTest failures - more fixes
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@900389 13f79535-47bb-0310-9956-ffa450edef68
2010-01-18 13:18:13 +00:00
Gary Tully ae6f8020e7 merge -c 898281 https://svn.apache.org/repos/asf/activemq/trunk - resolve intermittent ZeroPrefetchConsumerTest failure - prefetch excension decrement needs to be conditional on prefecth=0, relates to changes to prefetchExtension for https://issues.apache.org/activemq/browse/AMQ-2560
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@900386 13f79535-47bb-0310-9956-ffa450edef68
2010-01-18 13:17:40 +00:00
Gary Tully 3a76567b79 merge -c 897988 https://svn.apache.org/repos/asf/activemq/trunk - reduce unmatched ack exceptions, tidy up prefetchExtension https://issues.apache.org/activemq/browse/AMQ-2560
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@900385 13f79535-47bb-0310-9956-ffa450edef68
2010-01-18 13:16:34 +00:00
Gary Tully 03fc6ff5bf merge -c 897061 https://svn.apache.org/repos/asf/activemq/trunk - resolve potential lost ack with failover and an in progress consumer transaction that results in an Unmatched ack exception - resolve: https://issues.apache.org/activemq/browse/AMQ-2560
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@900384 13f79535-47bb-0310-9956-ffa450edef68
2010-01-18 13:15:23 +00:00
Bosanac Dejan 5a43a94db5 merging 900363 - DiscoveryNetworkReconnectTest failures
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@900372 13f79535-47bb-0310-9956-ffa450edef68
2010-01-18 12:44:34 +00:00
Gary Tully fb871adbbd merge -c 900318 https://svn.apache.org/repos/asf/activemq/trunk - resolve https://issues.apache.org/activemq/browse/AMQ-2572 - issue with unconsumed prefetched messages being ignored as duplicates - timing issue with consumer close and session dispatch
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@900327 13f79535-47bb-0310-9956-ffa450edef68
2010-01-18 10:15:28 +00:00
Bosanac Dejan 94f6520eb5 merging 899542 - https://issues.apache.org/activemq/browse/AMQ-2569 - spring.schema update
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@899561 13f79535-47bb-0310-9956-ffa450edef68
2010-01-15 08:31:10 +00:00
Bosanac Dejan bf7934f9b7 merging 898812 - https://issues.apache.org/activemq/browse/AMQ-2488 - dynamic osgi import for activemq-core
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@898814 13f79535-47bb-0310-9956-ffa450edef68
2010-01-13 15:56:05 +00:00
Robert Davies 3398a6911d remove erronouesly added TempStoreTest.java
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@896118 13f79535-47bb-0310-9956-ffa450edef68
2010-01-05 16:25:19 +00:00
Robert Davies b2e171dd72 Merged /activemq/trunk:r881278-881313 - for http://issues.apache.org/activemq/browse/AMQ-2475
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@896063 13f79535-47bb-0310-9956-ffa450edef68
2010-01-05 14:22:33 +00:00
Gary Tully 75567e62ce svn merge -c 895975 https://svn.apache.org/repos/asf/activemq/trunk - resolve https://issues.apache.org/activemq/browse/AMQ-2523 - have Usage use a shared executor with a limited pool of 10 threads and an unbounded queue. Fix potential dropped dispatch attempts when messages waiting for space fail due to memory again being full, can result is hung consumer. In this case, a new notification for not full needs to be registered. Added relevant test case.
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@895977 13f79535-47bb-0310-9956-ffa450edef68
2010-01-05 10:44:45 +00:00
Bosanac Dejan e7224cef6c merging 894347 - https://issues.apache.org/activemq/browse/AMQ-2553 - browsing dlq over transacted session
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@894389 13f79535-47bb-0310-9956-ffa450edef68
2009-12-29 13:54:03 +00:00
Gary Tully ab87d44e4b svn merge -c 893661 - last piece of https://issues.apache.org/activemq/browse/AMQ-2540 - fix order or audit recovery replay
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@893664 13f79535-47bb-0310-9956-ffa450edef68
2009-12-24 00:41:00 +00:00
Bosanac Dejan 255f3cd229 merging 892816 - adapting jdbc audit test
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@892818 13f79535-47bb-0310-9956-ffa450edef68
2009-12-21 13:32:25 +00:00
Bosanac Dejan 0245609f34 merging 891582,891622,892194,892242,892291,892729,892759: https://issues.apache.org/activemq/browse/AMQ-2473, https://issues.apache.org/activemq/browse/AMQ-2540
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@892781 13f79535-47bb-0310-9956-ffa450edef68
2009-12-21 11:50:56 +00:00
Bosanac Dejan 5fb258e8ea merging 892220 - https://issues.apache.org/activemq/browse/AMQ-2508 - SecurityContext.isInOneOf()
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@892221 13f79535-47bb-0310-9956-ffa450edef68
2009-12-18 11:15:33 +00:00