Robert Davies
a785cb75dd
expose internal maps to help debugging
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@636720 13f79535-47bb-0310-9956-ffa450edef68
2008-03-13 11:35:20 +00:00
Hiram R. Chirino
1096564117
Allow the region broker implemenation to get changed by subclasses of BrokerService.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@636609 13f79535-47bb-0310-9956-ffa450edef68
2008-03-13 03:09:48 +00:00
Robert Davies
93ccb9ca3b
try and allow for zero pretech consumers with lazy dispatch
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@636507 13f79535-47bb-0310-9956-ffa450edef68
2008-03-12 20:59:54 +00:00
Robert Davies
290ce2a6bf
ensure network connections use async dispatch
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@636454 13f79535-47bb-0310-9956-ffa450edef68
2008-03-12 19:00:25 +00:00
Robert Davies
8fd41894ca
Add network consumer id to a DemandSubscription
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@636428 13f79535-47bb-0310-9956-ffa450edef68
2008-03-12 17:12:35 +00:00
Robert Davies
f9cc04e5db
Add network consumer id to a DemandSubscription
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@636426 13f79535-47bb-0310-9956-ffa450edef68
2008-03-12 17:11:51 +00:00
Robert Davies
cb65470569
use a separate mutex for building backups
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@636425 13f79535-47bb-0310-9956-ffa450edef68
2008-03-12 17:10:17 +00:00
Robert Davies
712254d5d2
support a list of ConsumerId's from the network
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@636424 13f79535-47bb-0310-9956-ffa450edef68
2008-03-12 17:08:48 +00:00
Robert Davies
22565e4176
don't throw an exception if removing an invalid subscription -
...
it could happen from the ConnectionSplitBroker
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@636422 13f79535-47bb-0310-9956-ffa450edef68
2008-03-12 17:07:46 +00:00
Robert Davies
58cf400836
Check for old network Subscriptions as well as connections
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@636420 13f79535-47bb-0310-9956-ffa450edef68
2008-03-12 17:06:07 +00:00
Robert Davies
f67415d879
don't wait for ever when stopping the connection on a blocked write
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@636419 13f79535-47bb-0310-9956-ffa450edef68
2008-03-12 17:04:44 +00:00
Robert Davies
84792bafed
If pageIn is forced - don't do lazyDispatch
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@636411 13f79535-47bb-0310-9956-ffa450edef68
2008-03-12 16:48:22 +00:00
Robert Davies
a9ccf5623d
check for null message in MessageDispatch
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@636281 13f79535-47bb-0310-9956-ffa450edef68
2008-03-12 11:16:05 +00:00
Hiram R. Chirino
c6b88f1ecc
Made the ReconnectTest a little more robust.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@636106 13f79535-47bb-0310-9956-ffa450edef68
2008-03-11 21:17:51 +00:00
Robert Davies
2185cdb6e0
Fix supplied by Pete Schwamb for corrupted DiskIndexLinkedList
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@636078 13f79535-47bb-0310-9956-ffa450edef68
2008-03-11 19:46:58 +00:00
Robert Davies
7d70fec53a
make lazy dispatch the default for queues
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@636067 13f79535-47bb-0310-9956-ffa450edef68
2008-03-11 19:13:50 +00:00
Hiram R. Chirino
4fcacf7772
A client should connect to the same broker for it's sending and receiving so that the broker does the forwarding
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@636064 13f79535-47bb-0310-9956-ffa450edef68
2008-03-11 19:11:51 +00:00
Hiram R. Chirino
67d38fafd1
Fix for the failing QueueMasterSlaveTestUsingSharedFileTest on windows. The lock on the AsyncDataManager was not being retried.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@636037 13f79535-47bb-0310-9956-ffa450edef68
2008-03-11 17:59:24 +00:00
Hiram R. Chirino
75d43c027f
This test is very taxing.. if you didn't have a good machine it could produce false negatives.. lowering requirements a bit to reduce false negatives.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@635971 13f79535-47bb-0310-9956-ffa450edef68
2008-03-11 15:20:31 +00:00
Robert Davies
512b0c7e67
Don't use FilePendingMessageCursor if persitence is off
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@635932 13f79535-47bb-0310-9956-ffa450edef68
2008-03-11 14:05:20 +00:00
Robert Davies
8f1505ff55
tidy up imports
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@635753 13f79535-47bb-0310-9956-ffa450edef68
2008-03-10 23:10:46 +00:00
Robert Davies
7ee534ff26
monitor connection splits
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@635747 13f79535-47bb-0310-9956-ffa450edef68
2008-03-10 23:05:50 +00:00
Robert Davies
29cfdedb12
take out System println messages
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@635688 13f79535-47bb-0310-9956-ffa450edef68
2008-03-10 20:54:54 +00:00
Robert Davies
044c07d9a5
Added a lazy dispatch option for queues
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@635682 13f79535-47bb-0310-9956-ffa450edef68
2008-03-10 20:35:34 +00:00
Robert Davies
98b4923918
Simple Request/Reply test using temp queues over a network - with
...
a failure on every send
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@635681 13f79535-47bb-0310-9956-ffa450edef68
2008-03-10 20:33:24 +00:00
Robert Davies
c42c5ff976
Fix problem in message state tracker that will result on OME
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@635565 13f79535-47bb-0310-9956-ffa450edef68
2008-03-10 14:16:49 +00:00
Robert Davies
5e747b070d
Improvements to removing stale connections
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@634797 13f79535-47bb-0310-9956-ffa450edef68
2008-03-07 20:09:07 +00:00
Robert Davies
c803f531e3
Ignore invalid commands to the AdvisoryConsumer- can happen due
...
to the use of wildcards across a network
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@634775 13f79535-47bb-0310-9956-ffa450edef68
2008-03-07 18:43:51 +00:00
James Strachan
26eedea5fb
added support to be able to auto-expose ActiveMQ Queues into a CamelContext so that they are browsable by any Camel based tooling
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@634686 13f79535-47bb-0310-9956-ffa450edef68
2008-03-07 14:17:01 +00:00
Robert Davies
1a01d13731
Detect clients fail over - that haven't removed themselves from
...
a brokee
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@634589 13f79535-47bb-0310-9956-ffa450edef68
2008-03-07 09:06:30 +00:00
Robert Davies
3f9d6e2ef8
re-introduce optimize dispatch for queues
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@634588 13f79535-47bb-0310-9956-ffa450edef68
2008-03-07 09:02:37 +00:00
Hiram R. Chirino
4c481ec6a9
Added a ReentrantReadWriteLock to guard against a service call executing while a connection is being shutdown.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@634505 13f79535-47bb-0310-9956-ffa450edef68
2008-03-07 02:33:32 +00:00
Robert Davies
bb763f5f7a
dump an index
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@634490 13f79535-47bb-0310-9956-ffa450edef68
2008-03-07 01:01:18 +00:00
Robert Davies
88fbb05af5
Add foundation for monitoring split brokers from a clients view point
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@634488 13f79535-47bb-0310-9956-ffa450edef68
2008-03-07 00:59:02 +00:00
Robert Davies
cf55702288
resolve concurrent modification
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@634487 13f79535-47bb-0310-9956-ffa450edef68
2008-03-07 00:57:55 +00:00
Robert Davies
f4ca650108
Fix concurrent modification of pagedInMessages
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@634472 13f79535-47bb-0310-9956-ffa450edef68
2008-03-07 00:10:20 +00:00
Robert Davies
9cc2d3776e
open up to more Configuration
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@634421 13f79535-47bb-0310-9956-ffa450edef68
2008-03-06 21:29:22 +00:00
Robert Davies
4ae43a36b5
reduce contention around stats on connection - thx for spotting this Hiram!
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@634420 13f79535-47bb-0310-9956-ffa450edef68
2008-03-06 21:26:53 +00:00
Robert Davies
d56371fd69
fix current modification of linked list
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@634415 13f79535-47bb-0310-9956-ffa450edef68
2008-03-06 21:02:50 +00:00
Hiram R. Chirino
c0b74f0562
Fix for: https://issues.apache.org/activemq/browse/AMQ-1613
...
Avoid deadlocking with the thread calling oneway() when we are cleaning up the connection due to an Inactivity error.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@634411 13f79535-47bb-0310-9956-ffa450edef68
2008-03-06 20:45:02 +00:00
James Strachan
fb0e159499
added a helper class for auto-exposing ActiveMQ Queues into the CamelContext
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@634377 13f79535-47bb-0310-9956-ffa450edef68
2008-03-06 18:22:20 +00:00
James Strachan
5e897d6c38
updated the test case for http://issues.apache.org/activemq/browse/AMQ-1199 to make it a better test
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@634281 13f79535-47bb-0310-9956-ffa450edef68
2008-03-06 14:40:14 +00:00
James Strachan
f6efc5660d
added support for http://issues.apache.org/activemq/browse/AMQ-1199 so that its easy to browse the available queues & topics in a broker
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@634277 13f79535-47bb-0310-9956-ffa450edef68
2008-03-06 14:35:26 +00:00
Robert Davies
cd54a162f6
Define specific region classes for TempQueue and TempTopic
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@633976 13f79535-47bb-0310-9956-ffa450edef68
2008-03-05 18:59:58 +00:00
Robert Davies
e7316df001
synchronize around the messagesWaitingForSpace
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@633808 13f79535-47bb-0310-9956-ffa450edef68
2008-03-05 10:17:43 +00:00
Robert Davies
f6fd249d8c
remove unused import
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@633806 13f79535-47bb-0310-9956-ffa450edef68
2008-03-05 10:12:20 +00:00
Robert Davies
3b0afd6b71
Added NonCachedMessageContext
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@633800 13f79535-47bb-0310-9956-ffa450edef68
2008-03-05 09:35:31 +00:00
Robert Davies
26aeb46493
Added non persistent queue network test
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@633799 13f79535-47bb-0310-9956-ffa450edef68
2008-03-05 09:32:45 +00:00
Hiram R. Chirino
a9b841af61
The AsyncDataManager now supports doing a callback notification for when a write
...
has been secured to disk.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@633603 13f79535-47bb-0310-9956-ffa450edef68
2008-03-04 19:36:58 +00:00
Hiram R. Chirino
747b2ddc4a
Fixing edge case that does not normally occur. When marshalling a null object and size prefixing is disabled, we
...
were still prefixing the size of the data.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@633571 13f79535-47bb-0310-9956-ffa450edef68
2008-03-04 17:55:01 +00:00
Hiram R. Chirino
c84e58a948
Reduce contention by using an Atomic Reference.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@633570 13f79535-47bb-0310-9956-ffa450edef68
2008-03-04 17:52:14 +00:00
Hiram R. Chirino
1c8cfd9cfe
The testWildcardConsume has 1 consumer subscribe to 2 destiantions and made an assumption
...
that messages would delivered in the order published to the 2 different destinations. This is not correct
as the messages could queue up and get dispatched at different times. Updated the code so that this assumption
is no longer relied on.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@633554 13f79535-47bb-0310-9956-ffa450edef68
2008-03-04 17:28:53 +00:00
Hiram R. Chirino
3d18d59904
Protect the messagesWaitingForSpace variable against concurrent modification.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@633210 13f79535-47bb-0310-9956-ffa450edef68
2008-03-03 18:03:21 +00:00
Robert Davies
e376456111
Compress HashIndex on startup - only way to ensure the index
...
pages are loaded in correct order without changing the wire format
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@632964 13f79535-47bb-0310-9956-ffa450edef68
2008-03-03 07:18:00 +00:00
Robert Davies
b67f61df98
Don't use default container name for loader test
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@632963 13f79535-47bb-0310-9956-ffa450edef68
2008-03-03 07:16:34 +00:00
Robert Davies
18e1a6bfc1
HashTest expanded to load/unload/load indexes through testing
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@632962 13f79535-47bb-0310-9956-ffa450edef68
2008-03-03 07:15:45 +00:00
Robert Davies
d8b407bb63
Added copy file method
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@632961 13f79535-47bb-0310-9956-ffa450edef68
2008-03-03 07:14:39 +00:00
Robert Davies
c427689dad
make splitting consumers/producers memory limit optional and off
...
by default
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@632666 13f79535-47bb-0310-9956-ffa450edef68
2008-03-01 22:31:26 +00:00
Robert Davies
767b548715
fix for inaccurate page calculation in bin overflow
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@632651 13f79535-47bb-0310-9956-ffa450edef68
2008-03-01 19:59:49 +00:00
Robert Davies
32dc290eb7
reset defaults
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@632560 13f79535-47bb-0310-9956-ffa450edef68
2008-03-01 07:30:03 +00:00
Hiram R. Chirino
13829eff1d
The Producer MemoryLimit can lead to network deadlock when spooling is disabled.
...
So we now disable using it when sooling is used on a queue.
see:
https://issues.apache.org/activemq/browse/AMQ-1606
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@632455 13f79535-47bb-0310-9956-ffa450edef68
2008-02-29 21:59:33 +00:00
Robert Davies
c0b00b2d28
set track messages off by default
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@632333 13f79535-47bb-0310-9956-ffa450edef68
2008-02-29 14:55:10 +00:00
Robert Davies
710db267a9
Move back to using DEfaultThreadPools for reconnect tasks - as
...
for very bad connections, DedicatedTaskRunner could get swamped with
reconnect tasks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@632269 13f79535-47bb-0310-9956-ffa450edef68
2008-02-29 09:22:02 +00:00
Robert Davies
014f82a1e0
remove println() - oops
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@632051 13f79535-47bb-0310-9956-ffa450edef68
2008-02-28 16:45:17 +00:00
Robert Davies
03ecdb00ee
changed free list implementation
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@632050 13f79535-47bb-0310-9956-ffa450edef68
2008-02-28 16:42:30 +00:00
Robert Davies
e31ca80546
added size to toString() method
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@632047 13f79535-47bb-0310-9956-ffa450edef68
2008-02-28 16:38:34 +00:00
Robert Davies
571a253df7
added toString()
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@632046 13f79535-47bb-0310-9956-ffa450edef68
2008-02-28 16:36:56 +00:00
Robert Davies
a36426d202
keep alive should get a response
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@631965 13f79535-47bb-0310-9956-ffa450edef68
2008-02-28 13:29:35 +00:00
Adrian T. Co
a6e227dcdc
Tweak the logging a bit. Didn't like the idea of different log messages depending on log level.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@631866 13f79535-47bb-0310-9956-ffa450edef68
2008-02-28 06:24:17 +00:00
Adrian T. Co
da6c2d61f1
Changing logging to log stacktraces to debug only
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@631864 13f79535-47bb-0310-9956-ffa450edef68
2008-02-28 06:20:12 +00:00
Adrian T. Co
bf20d76622
https://issues.apache.org/activemq/browse/AMQ-1598
...
Remove extraneous Thread.dumpStack call
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@631848 13f79535-47bb-0310-9956-ffa450edef68
2008-02-28 05:12:44 +00:00
Hiram R. Chirino
e60828c077
Better qos options on the producer of this test.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@631665 13f79535-47bb-0310-9956-ffa450edef68
2008-02-27 18:07:46 +00:00
Hiram R. Chirino
b01374e05f
Added better weighted sleeps to make sure everything is going before we start sampling.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@631662 13f79535-47bb-0310-9956-ffa450edef68
2008-02-27 17:44:07 +00:00
Hiram R. Chirino
a9120b1b12
Adding a test does a load test across multiple network connections.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@631658 13f79535-47bb-0310-9956-ffa450edef68
2008-02-27 17:20:03 +00:00
Robert Davies
00893abe27
recycle hash pages
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@631537 13f79535-47bb-0310-9956-ffa450edef68
2008-02-27 10:21:27 +00:00
James Strachan
5075fb9dea
added a test case showing how to set a property using a Processor http://www.nabble.com/setting-JMSXGroupId-property-from-within-a-processor-tp15706825s22882p15706825.html
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@631509 13f79535-47bb-0310-9956-ffa450edef68
2008-02-27 07:56:33 +00:00
Robert Davies
e225ba622c
optionally replay messages on the fault tolerant transport
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@631244 13f79535-47bb-0310-9956-ffa450edef68
2008-02-26 15:00:37 +00:00
Robert Davies
25b6812daa
Added network and fault tolerant flags to ConnectionContext
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@631241 13f79535-47bb-0310-9956-ffa450edef68
2008-02-26 14:56:31 +00:00
Robert Davies
33724ec1c3
removed tmp destination tests - the check is done client side now
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@631240 13f79535-47bb-0310-9956-ffa450edef68
2008-02-26 14:55:45 +00:00
Robert Davies
cd24f8099f
Introduced AbstractTempRegion - to cater for temp destination
...
usage on failover
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@631237 13f79535-47bb-0310-9956-ffa450edef68
2008-02-26 14:50:43 +00:00
Robert Davies
16b4009348
added additional logging around ClassNotFoundException
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@631227 13f79535-47bb-0310-9956-ffa450edef68
2008-02-26 14:34:40 +00:00
Hiram R. Chirino
230255a479
https://issues.apache.org/activemq/browse/AMQ-1595
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@630253 13f79535-47bb-0310-9956-ffa450edef68
2008-02-22 17:03:39 +00:00
Robert Davies
b34f730231
expose some methods to make it easier to test
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@630136 13f79535-47bb-0310-9956-ffa450edef68
2008-02-22 10:05:33 +00:00
Hiram R. Chirino
3d33c0e51a
Fixing bug with qdox.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@630050 13f79535-47bb-0310-9956-ffa450edef68
2008-02-21 23:42:00 +00:00
Hiram R. Chirino
b141d21dce
Gaurd against too many read checks happening back to back.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@629859 13f79535-47bb-0310-9956-ffa450edef68
2008-02-21 16:39:16 +00:00
Robert Davies
204f6d8385
have backup off by default
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@629725 13f79535-47bb-0310-9956-ffa450edef68
2008-02-21 09:10:27 +00:00
Robert Davies
2a153b085f
Fix for https://issues.apache.org/activemq/browse/AMQ-1560
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@629713 13f79535-47bb-0310-9956-ffa450edef68
2008-02-21 08:13:08 +00:00
Hiram R. Chirino
60c260582d
Fix for https://issues.apache.org/activemq/browse/AMQ-1591
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@629639 13f79535-47bb-0310-9956-ffa450edef68
2008-02-20 22:24:18 +00:00
Robert Davies
34c530c39b
removed unused imports
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@629636 13f79535-47bb-0310-9956-ffa450edef68
2008-02-20 22:19:31 +00:00
Hiram R. Chirino
e0bdc012c1
Fix for https://issues.apache.org/activemq/browse/AMQ-1591
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@629631 13f79535-47bb-0310-9956-ffa450edef68
2008-02-20 22:05:02 +00:00
Robert Davies
bca91bb068
check for null byte passed as parameter
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@629623 13f79535-47bb-0310-9956-ffa450edef68
2008-02-20 21:47:18 +00:00
Adrian T. Co
13af1e36fb
- Fix for https://issues.apache.org/activemq/browse/AMQ-1576 (behavior is that if a jms property is null, it will not be converted, but will still be added to the default list of properties)
...
- Fix a spelling typo
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@629060 13f79535-47bb-0310-9956-ffa450edef68
2008-02-19 10:46:13 +00:00
Robert Davies
8768a04e63
doDispatch():
...
only apply message to least loaded if target subscription not
already found
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@629007 13f79535-47bb-0310-9956-ffa450edef68
2008-02-19 07:21:50 +00:00
Adrian T. Co
40950bc4b8
https://issues.apache.org/activemq/browse/AMQ-1580
...
- Check for 0 length buffer when receiving byte messages
- Don't send an empty byte message if there is no data to flush
- Added test case from AMQQ-1580
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@628988 13f79535-47bb-0310-9956-ffa450edef68
2008-02-19 04:37:55 +00:00
Robert Davies
900c9af498
When recovering durable subscriptions - ensure they are recovered only once
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@628778 13f79535-47bb-0310-9956-ffa450edef68
2008-02-18 15:13:12 +00:00
Adrian T. Co
4a8ade0fae
Fix typo: https://issues.apache.org/activemq/browse/AMQ-1565
...
Added explicit version for maven-antrun-plugin
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@628764 13f79535-47bb-0310-9956-ffa450edef68
2008-02-18 14:52:56 +00:00
Robert Davies
213c3ae379
Apply patch for https://issues.apache.org/activemq/browse/AMQ-1584
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@628710 13f79535-47bb-0310-9956-ffa450edef68
2008-02-18 12:55:51 +00:00
Robert Davies
2747573f66
Fix for https://issues.apache.org/activemq/browse/AMQ-1583
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@628708 13f79535-47bb-0310-9956-ffa450edef68
2008-02-18 12:50:38 +00:00
Robert Davies
d4382e483b
Change Queue dispatch model to reduce contention for lots of
...
consumers
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@628667 13f79535-47bb-0310-9956-ffa450edef68
2008-02-18 09:38:10 +00:00
Robert Davies
edd35d4b13
Added a TaksRunner that always executes iterate - even if its already running
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@628665 13f79535-47bb-0310-9956-ffa450edef68
2008-02-18 09:36:39 +00:00
Robert Davies
8250a3c4b2
Fix some timing issues with test cases
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@628664 13f79535-47bb-0310-9956-ffa450edef68
2008-02-18 09:35:37 +00:00
Robert Davies
7882eb7968
Fix some timing issues with test cases
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@628663 13f79535-47bb-0310-9956-ffa450edef68
2008-02-18 09:32:57 +00:00
Robert Davies
da46fffc54
removed unused property
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@620760 13f79535-47bb-0310-9956-ffa450edef68
2008-02-12 11:11:05 +00:00
Robert Davies
be6376373f
Utility class for messages
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@620738 13f79535-47bb-0310-9956-ffa450edef68
2008-02-12 10:04:36 +00:00
Robert Davies
f94406aae6
calculate message size even if the minimumMessageSize == 0
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@620500 13f79535-47bb-0310-9956-ffa450edef68
2008-02-11 14:59:56 +00:00
Robert Davies
5460b7bb47
remove patch comment
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@619789 13f79535-47bb-0310-9956-ffa450edef68
2008-02-08 07:24:26 +00:00
Robert Davies
24fea9368c
iterate() now returns false after every run to prevent spinning
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@619652 13f79535-47bb-0310-9956-ffa450edef68
2008-02-07 21:42:56 +00:00
Hiram R. Chirino
939a3160f3
Handle the OverlappingFileLockException that could occur.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@619511 13f79535-47bb-0310-9956-ffa450edef68
2008-02-07 17:13:03 +00:00
Robert Davies
52ca2de3f0
remove shutdown hook
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@619391 13f79535-47bb-0310-9956-ffa450edef68
2008-02-07 12:58:46 +00:00
Robert Davies
6f66aa0eea
can't determine order messages will arrive in for separate queues
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@619390 13f79535-47bb-0310-9956-ffa450edef68
2008-02-07 12:57:52 +00:00
Robert Davies
ac0a88f44d
slave deletes all messages on startup now
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@619388 13f79535-47bb-0310-9956-ffa450edef68
2008-02-07 12:56:12 +00:00
Robert Davies
6d0c552c8a
cursor fixes
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@619387 13f79535-47bb-0310-9956-ffa450edef68
2008-02-07 12:55:02 +00:00
Robert Davies
1a6cbfa651
fix for https://issues.apache.org/activemq/browse/AMQ-1446
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@619347 13f79535-47bb-0310-9956-ffa450edef68
2008-02-07 10:15:54 +00:00
Robert Davies
6c52d28985
Fix for:
...
https://issues.apache.org/activemq/browse/AMQ-1116
https://issues.apache.org/activemq/browse/AMQ-1575
https://issues.apache.org/activemq/browse/AMQ-1577
https://issues.apache.org/activemq/browse/AMQ-1581
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@619336 13f79535-47bb-0310-9956-ffa450edef68
2008-02-07 09:51:19 +00:00
Hiram R. Chirino
527bd15a5a
- Clients do not shutdown due to non-daemon threads hanging around.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@619004 13f79535-47bb-0310-9956-ffa450edef68
2008-02-06 14:48:42 +00:00
Robert Davies
149428b5bc
Reduce contention on the AMQ Store
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@618981 13f79535-47bb-0310-9956-ffa450edef68
2008-02-06 12:23:41 +00:00
Robert Davies
65beee6895
comment out send first then consume
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@618817 13f79535-47bb-0310-9956-ffa450edef68
2008-02-05 23:08:01 +00:00
Robert Davies
f81d0d59d3
lock dispatching (again) whilst adding a consumer
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@618689 13f79535-47bb-0310-9956-ffa450edef68
2008-02-05 16:20:11 +00:00
Robert Davies
ecc87ea672
add isConnected() flag to a Transport
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@618656 13f79535-47bb-0310-9956-ffa450edef68
2008-02-05 14:06:43 +00:00
Robert Davies
c128634fa6
copy message before resend
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@618655 13f79535-47bb-0310-9956-ffa450edef68
2008-02-05 14:05:46 +00:00
Robert Davies
d0f3d4dce9
Make maximum page size for queues configurable
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@618654 13f79535-47bb-0310-9956-ffa450edef68
2008-02-05 14:04:39 +00:00
Robert Davies
071b4b109e
refactored cursors to improve re-use
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@618621 13f79535-47bb-0310-9956-ffa450edef68
2008-02-05 12:14:49 +00:00
Robert Davies
4188ed0b9a
increase the length of the wait for messages
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@618620 13f79535-47bb-0310-9956-ffa450edef68
2008-02-05 12:11:09 +00:00
Robert Davies
ad3799cbae
removed test waiting for space
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@618619 13f79535-47bb-0310-9956-ffa450edef68
2008-02-05 12:07:32 +00:00
Robert Davies
c99f05529f
Updated the performance tests
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@618617 13f79535-47bb-0310-9956-ffa450edef68
2008-02-05 12:05:52 +00:00
Robert Davies
c24574c801
don't set memory limit
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@618615 13f79535-47bb-0310-9956-ffa450edef68
2008-02-05 12:01:19 +00:00
Robert Davies
0c1279009c
remove unused imports
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@618612 13f79535-47bb-0310-9956-ffa450edef68
2008-02-05 11:45:26 +00:00
Hiram R. Chirino
ef0e1bac6e
Adding a ReadOnlyAsyncDataManager so that you can access a set of data files in a read only way.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@618082 13f79535-47bb-0310-9956-ffa450edef68
2008-02-03 20:43:17 +00:00
Robert Davies
3ac0537e3e
added isDisposed to Transport interface
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@617015 13f79535-47bb-0310-9956-ffa450edef68
2008-01-31 06:34:12 +00:00
Robert Davies
5f83e62d66
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@616811 13f79535-47bb-0310-9956-ffa450edef68
2008-01-30 16:42:39 +00:00
Robert Davies
a55149cad0
Further enhancement for https://issues.apache.org/activemq/browse/AMQ-1572
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@616735 13f79535-47bb-0310-9956-ffa450edef68
2008-01-30 12:14:12 +00:00
Robert Davies
418823a7e1
Further enhancement for https://issues.apache.org/activemq/browse/AMQ-1572
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@616733 13f79535-47bb-0310-9956-ffa450edef68
2008-01-30 12:10:22 +00:00
Robert Davies
e210657db2
Fix for https://issues.apache.org/activemq/browse/AMQ-1572
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@616506 13f79535-47bb-0310-9956-ffa450edef68
2008-01-29 20:06:47 +00:00
Robert Davies
3249682bda
disable caching of messages for the Queue Cursor
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@615341 13f79535-47bb-0310-9956-ffa450edef68
2008-01-25 21:06:43 +00:00
Robert Davies
e16bcf2f48
turn cache off by default
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@615297 13f79535-47bb-0310-9956-ffa450edef68
2008-01-25 18:25:04 +00:00
Robert Davies
b8674d4006
disable optimized dispatch
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@615288 13f79535-47bb-0310-9956-ffa450edef68
2008-01-25 17:56:06 +00:00
Robert Davies
cce756605f
use task runner to dispatch messages - improve concurrency
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@615287 13f79535-47bb-0310-9956-ffa450edef68
2008-01-25 17:52:54 +00:00
Robert Davies
55810b3155
resolution for https://issues.apache.org/activemq/browse/AMQ-1566
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@614645 13f79535-47bb-0310-9956-ffa450edef68
2008-01-23 20:08:27 +00:00
Robert Davies
23cda2d6bb
Fix for https://issues.apache.org/activemq/browse/AMQ-1562
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@614206 13f79535-47bb-0310-9956-ffa450edef68
2008-01-22 14:28:10 +00:00
Robert Davies
17e22cff6f
Fix for https://issues.apache.org/activemq/browse/AMQ-1475
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@613899 13f79535-47bb-0310-9956-ffa450edef68
2008-01-21 14:22:58 +00:00
Robert Davies
01cef910db
Fix for https://issues.apache.org/activemq/browse/AMQ-1560
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@613874 13f79535-47bb-0310-9956-ffa450edef68
2008-01-21 13:09:38 +00:00
Robert Davies
1f2804a76a
Fix for https://issues.apache.org/activemq/browse/AMQ-1559
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@613832 13f79535-47bb-0310-9956-ffa450edef68
2008-01-21 10:33:55 +00:00
Robert Davies
83c3dca9e5
Fix for https://issues.apache.org/activemq/browse/AMQ-1510
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@613830 13f79535-47bb-0310-9956-ffa450edef68
2008-01-21 10:31:22 +00:00
Robert Davies
caf7a7c7c2
Fix for https://issues.apache.org/activemq/browse/AMQ-1556
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@613829 13f79535-47bb-0310-9956-ffa450edef68
2008-01-21 10:28:59 +00:00
Robert Davies
8f190f188b
increase the amount of time to receive messages - to try prevent intermittent failure
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@613244 13f79535-47bb-0310-9956-ffa450edef68
2008-01-18 19:49:56 +00:00
Robert Davies
8d11f07a96
Fix for https://issues.apache.org/activemq/browse/AMQ-1553
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@613230 13f79535-47bb-0310-9956-ffa450edef68
2008-01-18 19:16:15 +00:00
Robert Davies
671ed4916e
resources for the sharedFileMaster tests
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@612910 13f79535-47bb-0310-9956-ffa450edef68
2008-01-17 18:18:44 +00:00
James Strachan
a28ccae9fb
added a test case and fix for AMQ-775 along with a useful base class for testing ActiveMQ using Camel
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@612828 13f79535-47bb-0310-9956-ffa450edef68
2008-01-17 14:31:03 +00:00
James Strachan
5361df13dc
added a little helper factory bean for https://issues.apache.org/activemq/browse/AMQ-1552 to allow easy failover configuration without explicit URI magic
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@612824 13f79535-47bb-0310-9956-ffa450edef68
2008-01-17 14:20:35 +00:00
James Strachan
10eae9d6e7
fixed the schema location
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@612823 13f79535-47bb-0310-9956-ffa450edef68
2008-01-17 14:19:15 +00:00
Hiram R. Chirino
c4d8d86715
Applying https://issues.apache.org/activemq/browse/AMQ-1361
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@612661 13f79535-47bb-0310-9956-ffa450edef68
2008-01-17 00:48:02 +00:00
Hiram R. Chirino
2b5608f761
Applying patch at https://issues.apache.org/activemq/browse/AMQ-943
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@612544 13f79535-47bb-0310-9956-ffa450edef68
2008-01-16 19:15:50 +00:00
Robert Davies
634da7a88e
Add producers to DestinationStatistics
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@612542 13f79535-47bb-0310-9956-ffa450edef68
2008-01-16 19:03:02 +00:00
Robert Davies
5f4db41d2d
set correct consumer count on consumer advisories
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@612459 13f79535-47bb-0310-9956-ffa450edef68
2008-01-16 13:56:24 +00:00
Hiram R. Chirino
b39430ab17
Upgrade to xbean 3.3-SNAPSHOT to pull in the fix for:
...
http://issues.apache.org/jira/browse/XBEAN-101
PropertyPlaceholderConfigurer can not be used to resolve values assigned to xbean properties that have a custom PropertyEditor
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@610502 13f79535-47bb-0310-9956-ffa450edef68
2008-01-09 18:44:34 +00:00
Robert Davies
3163d48eb1
applied patch for https://issues.apache.org/activemq/browse/AMQ-1542
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@610432 13f79535-47bb-0310-9956-ffa450edef68
2008-01-09 16:16:05 +00:00
Robert Davies
3d10accb46
fixes for load testing
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@609606 13f79535-47bb-0310-9956-ffa450edef68
2008-01-07 13:51:06 +00:00
Robert Davies
0640cb703a
Added basic load test for queues
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@608902 13f79535-47bb-0310-9956-ffa450edef68
2008-01-04 16:07:18 +00:00
Robert Davies
9899dff93d
nake inflight message count a little more explicit
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@608414 13f79535-47bb-0310-9956-ffa450edef68
2008-01-03 10:03:19 +00:00
Robert Davies
082bbf0f06
Add some duplex property for network connector view
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@608356 13f79535-47bb-0310-9956-ffa450edef68
2008-01-03 06:34:40 +00:00
Robert Davies
a0b3e3211e
Fix for https://issues.apache.org/activemq/browse/AMQ-1533
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@608034 13f79535-47bb-0310-9956-ffa450edef68
2008-01-02 08:16:25 +00:00
Robert Davies
409902c394
Tweaking for Queue performance and concurrency
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@607317 13f79535-47bb-0310-9956-ffa450edef68
2007-12-28 19:52:24 +00:00
Robert Davies
c493b87f0a
This test could get stuck - now only wait 2 seconds for a message
...
and use Memory Message Store
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@607186 13f79535-47bb-0310-9956-ffa450edef68
2007-12-28 08:11:14 +00:00
Hiram R. Chirino
2a538388fc
Adding missing resource file.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@607074 13f79535-47bb-0310-9956-ffa450edef68
2007-12-27 14:36:27 +00:00
Robert Davies
2db7df72d6
Reduce contention around Queues
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@607038 13f79535-47bb-0310-9956-ffa450edef68
2007-12-27 11:06:50 +00:00
Robert Davies
ea0cd012b1
fix for http://issues.apache.org/activemq/browse/AMQ-1157
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@607037 13f79535-47bb-0310-9956-ffa450edef68
2007-12-27 11:03:41 +00:00
Robert Davies
069a5676f1
multiple paths try to re-start the broker with vm:// trapnsport -
...
changed URI to tcp://
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@606682 13f79535-47bb-0310-9956-ffa450edef68
2007-12-24 09:42:25 +00:00
Robert Davies
8179df80f1
don't wait for ever for worker to stop
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@606260 13f79535-47bb-0310-9956-ffa450edef68
2007-12-21 17:56:03 +00:00
Robert Davies
34378e8ec1
Only wait 1 second for connections to stop. When killing a stale
...
connection - if stop doesn't complete - it hangs the broker.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@606241 13f79535-47bb-0310-9956-ffa450edef68
2007-12-21 16:45:21 +00:00
Robert Davies
9f94b6c509
Fix for https://issues.apache.org/activemq/browse/AMQ-1528
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@606022 13f79535-47bb-0310-9956-ffa450edef68
2007-12-20 20:42:43 +00:00
Hiram R. Chirino
471ea33051
Applied Dejan's patch on AMQ-1272 with some small tweaks.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@605944 13f79535-47bb-0310-9956-ffa450edef68
2007-12-20 14:37:41 +00:00
Robert Davies
462921addf
Fix for https://issues.apache.org/activemq/browse/AMQ-1524
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@605943 13f79535-47bb-0310-9956-ffa450edef68
2007-12-20 14:35:20 +00:00
Robert Davies
1d7b88431a
Fix for https://issues.apache.org/activemq/browse/AMQ-1528
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@605940 13f79535-47bb-0310-9956-ffa450edef68
2007-12-20 14:29:30 +00:00
Robert Davies
de14440109
Fix for https://issues.apache.org/activemq/browse/AMQ-1525
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@605698 13f79535-47bb-0310-9956-ffa450edef68
2007-12-19 21:09:40 +00:00
Robert Davies
8228663f6d
close socket in a separate thread and only await stopLatch
...
for 2 seconds - as it close could be called by InactivityMonitor
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@605671 13f79535-47bb-0310-9956-ffa450edef68
2007-12-19 19:50:11 +00:00
Robert Davies
3318a9f0e3
ConnectionClosed exceptions being thrown in a regular connection close
...
removed the isClosing() check before sending async
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@605518 13f79535-47bb-0310-9956-ffa450edef68
2007-12-19 11:49:15 +00:00
Robert Davies
a32832f4cb
Fix for https://issues.apache.org/activemq/browse/AMQ-1521
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@604700 13f79535-47bb-0310-9956-ffa450edef68
2007-12-16 20:40:50 +00:00
Robert Davies
5582cc1751
update performance tests
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@604691 13f79535-47bb-0310-9956-ffa450edef68
2007-12-16 20:16:59 +00:00
Robert Davies
628842f69a
Fix for https://issues.apache.org/activemq/browse/AMQ-1518
...
take minimum threads to task factory to 0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@604689 13f79535-47bb-0310-9956-ffa450edef68
2007-12-16 20:14:22 +00:00
Robert Davies
225d2bf055
try and ensure that the brokers shutdown cleanly for the
...
ReliableReconnectTest - as it can hang
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@603952 13f79535-47bb-0310-9956-ffa450edef68
2007-12-13 16:52:27 +00:00
Robert Davies
0ac3f165dc
changed unlock() method to use remove() instead of clearProperty
...
as this doesn't work on some platforms
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@603927 13f79535-47bb-0310-9956-ffa450edef68
2007-12-13 14:45:01 +00:00
Robert Davies
d4d9ba88b9
Add warning message if not enough space to complete a transaction
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@603884 13f79535-47bb-0310-9956-ffa450edef68
2007-12-13 11:02:18 +00:00
Robert Davies
3099953b72
If can't recover message id from the store - change error message
...
to debug. The problem occurs because the message has already been
dispatched
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@603881 13f79535-47bb-0310-9956-ffa450edef68
2007-12-13 10:56:07 +00:00
Robert Davies
388a5c4356
crap - left a Thread.dumpStack() method in the class - removing
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@603873 13f79535-47bb-0310-9956-ffa450edef68
2007-12-13 10:41:16 +00:00
Robert Davies
cea2f930c3
crap - left a Thread.dumpStack() method in the class - removing
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@603869 13f79535-47bb-0310-9956-ffa450edef68
2007-12-13 09:57:27 +00:00
Robert Davies
a3b4c5a358
Fix for https://issues.apache.org/activemq/browse/AMQ-1507
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@603863 13f79535-47bb-0310-9956-ffa450edef68
2007-12-13 09:19:36 +00:00
Robert Davies
92bbce1d6f
Fix for https://issues.apache.org/activemq/browse/AMQ-1507
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@603772 13f79535-47bb-0310-9956-ffa450edef68
2007-12-12 23:10:25 +00:00
Robert Davies
1c4ef90ff3
Fix for https://issues.apache.org/activemq/browse/AMQ-1507
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@603762 13f79535-47bb-0310-9956-ffa450edef68
2007-12-12 22:53:59 +00:00
Robert Davies
a5a6a2a5d1
Added more synchronization
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@603348 13f79535-47bb-0310-9956-ffa450edef68
2007-12-11 20:19:46 +00:00
Hiram R. Chirino
27c87d20f3
Applied patch in AMQ-1515 Thx David.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@602565 13f79535-47bb-0310-9956-ffa450edef68
2007-12-08 21:45:55 +00:00
Hiram R. Chirino
6f0dcac677
Added a little more debug logging to the InactivityMonitor because I suspect that
...
the schedular might not be triggering the read and write checks at the right time.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@602553 13f79535-47bb-0310-9956-ffa450edef68
2007-12-08 21:31:14 +00:00
Hiram R. Chirino
2984963912
If you have a multi-threaded client which share 1 connection to the broker it is possible you may have seen errors like:
...
2007-12-05 14:14:52,606 [VMTransport] ERROR - org.apache.activemq.broker.TransportConnection.Service - Async error occurred: java.lang.IllegalStateException: Cannot lookup a connection that had not been registered: ID:bubba-38184-1196882086290-2:1
java.lang.IllegalStateException: Cannot lookup a connection that had not been registered: ID:bubba-38184-1196882086290-2:1
at org.apache.activemq.broker.SingleTransportConnectionStateRegister.lookupConnectionState(SingleTransportConnectionStateRegister.java:113)
at org.apache.activemq.broker.TransportConnection.lookupConnectionState(TransportConnection.java:1313)
at org.apache.activemq.broker.TransportConnection.processRemoveConsumer(TransportConnection.java:538)
at org.apache.activemq.command.RemoveInfo.visit(RemoveInfo.java:64)
at org.apache.activemq.broker.TransportConnection.service(TransportConnection.java:281)
at org.apache.activemq.broker.TransportConnection$1.onCommand(TransportConnection.java:178)
at org.apache.activemq.transport.ResponseCorrelator.onCommand(ResponseCorrelator.java:100)
at org.apache.activemq.transport.TransportFilter.onCommand(TransportFilter.java:67)
at org.apache.activemq.transport.vm.VMTransport.iterate(VMTransport.java:202)
at org.apache.activemq.thread.PooledTaskRunner.runTask(PooledTaskRunner.java:118)
at org.apache.activemq.thread.PooledTaskRunner$1.run(PooledTaskRunner.java:42)
at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:885)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:907)
at java.lang.Thread.run(Thread.java:619)
root cause is that the client side has multiple threads calling close() on consumer/session and the connection objects. If the timing of those concurrent calls was just right, it is possible for the client to send the connection close message followed by a session or consumer close message which is invalid and would result in IllegalStateException reported by the broker.
- Simplified the ActiveMQConnection and TransportConnection shutdown so that this does does not happen.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@602529 13f79535-47bb-0310-9956-ffa450edef68
2007-12-08 18:56:11 +00:00
Robert Davies
8c541377bd
Fix for excessive memory usage for durable consumers -
...
see https://issues.apache.org/activemq/browse/AMQ-1490
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@602440 13f79535-47bb-0310-9956-ffa450edef68
2007-12-08 10:03:26 +00:00
Robert Davies
5628b3e4ba
Added synchronization to prevent concurrent modification
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@602260 13f79535-47bb-0310-9956-ffa450edef68
2007-12-07 22:47:10 +00:00
Robert Davies
ddff5e5c16
Fix for https://issues.apache.org/activemq/browse/AMQ-1512
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@601011 13f79535-47bb-0310-9956-ffa450edef68
2007-12-04 17:21:54 +00:00
Robert Davies
f472000467
Changes to address memory usage for large transactions for:
...
https://issues.apache.org/activemq/browse/AMQ-1490
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@600891 13f79535-47bb-0310-9956-ffa450edef68
2007-12-04 11:27:58 +00:00
Robert Davies
2913fb8ada
Using wrong class to initialize the log
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@600671 13f79535-47bb-0310-9956-ffa450edef68
2007-12-03 20:33:34 +00:00
Hiram R. Chirino
1ba3532365
handle the inactivity actions in an async thread so that the schedular thread does not get blocked.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@599993 13f79535-47bb-0310-9956-ffa450edef68
2007-11-30 22:39:26 +00:00
Hiram R. Chirino
d83969f6a8
Allow a blocked thread to unwind if it's connection is getting terminated.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@599835 13f79535-47bb-0310-9956-ffa450edef68
2007-11-30 14:42:53 +00:00
Robert Davies
d59fd98daa
updated so that we can use delete the db on start-up
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@599470 13f79535-47bb-0310-9956-ffa450edef68
2007-11-29 15:03:29 +00:00
Robert Davies
9dd11cb71f
Fix for https://issues.apache.org/activemq/browse/AMQ-1490
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@599129 13f79535-47bb-0310-9956-ffa450edef68
2007-11-28 20:19:27 +00:00
Robert Davies
987ad27449
removed System.out logging
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@599122 13f79535-47bb-0310-9956-ffa450edef68
2007-11-28 20:02:16 +00:00
Robert Davies
bbe26eddc2
Fix for https://issues.apache.org/activemq/browse/AMQ-1502
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@598330 13f79535-47bb-0310-9956-ffa450edef68
2007-11-26 16:15:12 +00:00
Robert Davies
fd2c95e9bc
Fix for https://issues.apache.org/activemq/browse/AMQ-1491
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@597582 13f79535-47bb-0310-9956-ffa450edef68
2007-11-23 07:51:02 +00:00
Robert Davies
ba8b248788
Fix for https://issues.apache.org/activemq/browse/AMQ-1500
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@597581 13f79535-47bb-0310-9956-ffa450edef68
2007-11-23 07:40:51 +00:00
Hiram R. Chirino
1aab7d3597
Adding missing headers
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@594172 13f79535-47bb-0310-9956-ffa450edef68
2007-11-12 15:11:44 +00:00
Hiram R. Chirino
5e3aa21375
Scale back this test a little bit. It was storing 1.6 GIG is message contents. Which took a long time to store and also
...
will fail on machines that don't have the much free space. If we want to run BIG tests like that they should go into a
system testing module. Scaled it back so that only 160 Megs of data are generated by the test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@593585 13f79535-47bb-0310-9956-ffa450edef68
2007-11-09 16:30:07 +00:00
Hiram R. Chirino
2edad74ca9
The VMTransport now let's it's peer know when it's being stopped so that the Peer can give its' transport listener a peer disconnected exception. Otherwise a VM transport client could disconnect without the server side knowing it disconnected and the server side would not terminate it's side of the connection. This could be seen as a memory leak on when the static network config is setup and one of the static brokers is not up.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@593204 13f79535-47bb-0310-9956-ffa450edef68
2007-11-08 15:39:51 +00:00
Hiram R. Chirino
04a637916e
Added better temp destination support. We now properly create temp destinations that the client can subscribe to
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@592531 13f79535-47bb-0310-9956-ffa450edef68
2007-11-06 19:44:58 +00:00
Hiram R. Chirino
ada47fbc50
- memory leak fix: TransportConnection would leak memory if an error occured while start()ing the connection. Most visible when you create a network connector pointing at a remote broker that was down since this loops through creating TransportConnectors every few seconds.
...
- Deadlock fix VMTransport could dead lock if during start() an error occured and stop was recusively called.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@592114 13f79535-47bb-0310-9956-ffa450edef68
2007-11-05 18:47:16 +00:00
Hiram R. Chirino
62890b3fbb
- Reduced verbosity of logging in TransportConnector so that exceptions should only be in DEBUG messages.
...
- Added more logging to SimpleDiscoveryAgent so that we can see what it's doing in regards to reconnect handling and
enabled exponential backoff by default.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@592090 13f79535-47bb-0310-9956-ffa450edef68
2007-11-05 17:07:38 +00:00
Robert Davies
770642a8a1
Further enhancement to https://issues.apache.org/activemq/browse/AMQ-1246
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@591442 13f79535-47bb-0310-9956-ffa450edef68
2007-11-02 20:09:57 +00:00
Robert Davies
229ca6afd7
Fix for https://issues.apache.org/activemq/browse/AMQ-1246
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@591160 13f79535-47bb-0310-9956-ffa450edef68
2007-11-01 22:42:33 +00:00
Robert Davies
b2544046c5
Fix for https://issues.apache.org/activemq/browse/AMQ-1486
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@591148 13f79535-47bb-0310-9956-ffa450edef68
2007-11-01 21:49:13 +00:00
Robert Davies
9a491bbc76
Fix for https://issues.apache.org/activemq/browse/AMQ-1485
...
Fix npe for above
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@591145 13f79535-47bb-0310-9956-ffa450edef68
2007-11-01 21:23:44 +00:00
Robert Davies
30fe17834c
Fix for https://issues.apache.org/activemq/browse/AMQ-1485
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@591142 13f79535-47bb-0310-9956-ffa450edef68
2007-11-01 20:26:50 +00:00
Robert Davies
28296e689c
Fix for https://issues.apache.org/activemq/browse/AMQ-1485
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@591113 13f79535-47bb-0310-9956-ffa450edef68
2007-11-01 18:37:28 +00:00
Robert Davies
26387143e8
updated properties
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@590623 13f79535-47bb-0310-9956-ffa450edef68
2007-10-31 11:09:03 +00:00
Robert Davies
b2969d05a9
tidy up comments
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@589330 13f79535-47bb-0310-9956-ffa450edef68
2007-10-28 10:54:35 +00:00
Robert Davies
c8761c7e0f
Fix for https://issues.apache.org/activemq/browse/AMQ-1479
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@589314 13f79535-47bb-0310-9956-ffa450edef68
2007-10-28 09:39:12 +00:00
Robert Davies
9352c9fcdc
Test case for: https://issues.apache.org/activemq/browse/AMQ-1479
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@589048 13f79535-47bb-0310-9956-ffa450edef68
2007-10-27 04:14:35 +00:00
Hiram R. Chirino
582f3401fa
The caching of the prepared statement for updating the last ack was wrong.
...
Reported at http://www.nabble.com/Is-this-a-bug-in-DefaultJDBCAdapter.java--tf1890445s2354.html#a5170127
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@588767 13f79535-47bb-0310-9956-ffa450edef68
2007-10-26 20:20:25 +00:00
Hiram R. Chirino
0e7162509d
fix bad cast
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@588731 13f79535-47bb-0310-9956-ffa450edef68
2007-10-26 18:16:17 +00:00
Hiram R. Chirino
3a4a360d3f
Avoid deleting datafiles that are in-use.. timing issue was making this possible
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@588725 13f79535-47bb-0310-9956-ffa450edef68
2007-10-26 18:00:14 +00:00
Hiram R. Chirino
6084b6061b
MarshallingSupport.unmarshalPrimitive is throwing "Unknown primitive type: 0" when nested map contains a null
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@588718 13f79535-47bb-0310-9956-ffa450edef68
2007-10-26 17:32:19 +00:00
Hiram R. Chirino
ceec57aa0d
Removed synchronizations on all the processXXX() methods to avoid getting into situations where deadlocks occur.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@588260 13f79535-47bb-0310-9956-ffa450edef68
2007-10-25 15:43:34 +00:00
Hiram R. Chirino
43b808d158
Cleanup the leaky abstraction of the DiscoveryAgent. see:
...
https://issues.apache.org/activemq/browse/AMQ-1477
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@587927 13f79535-47bb-0310-9956-ffa450edef68
2007-10-24 16:53:46 +00:00
Hiram R. Chirino
1c1ed4d953
allow any setter to be called
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@587618 13f79535-47bb-0310-9956-ffa450edef68
2007-10-23 19:11:34 +00:00
Hiram R. Chirino
230a57b155
https://issues.apache.org/activemq/browse/AMQ-1268
...
Test case regression was fixed.. enabling test again
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@587509 13f79535-47bb-0310-9956-ffa450edef68
2007-10-23 13:58:59 +00:00
Hiram R. Chirino
82d1c91b3f
Fix for https://issues.apache.org/activemq/browse/AMQ-796
...
- The threads associated with the session are now setup to be non-daemon so that if you
setup a MessageListener and let the main thread exit, your program will not terminate
if there are no active transport threads which is the case when the failover transport
is in the middle of reconnecting to a broker.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@587504 13f79535-47bb-0310-9956-ffa450edef68
2007-10-23 13:36:15 +00:00
Robert Davies
569e5ca78c
synchronize doMessageSend() to ensure messages are stored and dispatched
...
in the right order
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@587396 13f79535-47bb-0310-9956-ffa450edef68
2007-10-23 05:38:36 +00:00
Hiram R. Chirino
d3d58fe41d
Test case and Fix for https://issues.apache.org/activemq/browse/AMQ-777
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@587216 13f79535-47bb-0310-9956-ffa450edef68
2007-10-22 19:37:01 +00:00
Hiram R. Chirino
6bb7fba3c5
Avoid deadlock described at: https://issues.apache.org/activemq/browse/AMQ-1468
...
Synchronization not really required once the transport errors out..
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@587198 13f79535-47bb-0310-9956-ffa450edef68
2007-10-22 19:01:16 +00:00
Hiram R. Chirino
328229b42b
Fixed the test cases in FanoutTransportBrokerTest also added a fanOutQueues property to enabled fanning out on
...
Queues. See issue: https://issues.apache.org/activemq/browse/AMQ-1464
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@587188 13f79535-47bb-0310-9956-ffa450edef68
2007-10-22 18:39:57 +00:00
Robert Davies
565588c13d
check for message order
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@587091 13f79535-47bb-0310-9956-ffa450edef68
2007-10-22 13:45:12 +00:00
Robert Davies
13fc99769f
remove System messages
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@587051 13f79535-47bb-0310-9956-ffa450edef68
2007-10-22 10:10:40 +00:00
Robert Davies
36486fe5b4
Fix for https://issues.apache.org/activemq/browse/AMQ-1449
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@587033 13f79535-47bb-0310-9956-ffa450edef68
2007-10-22 08:38:22 +00:00
Robert Davies
99966f58e7
fix for https://issues.apache.org/activemq/browse/AMQ-1467
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@586581 13f79535-47bb-0310-9956-ffa450edef68
2007-10-19 19:07:19 +00:00
Robert Davies
1ee00173d6
Fix for https://issues.apache.org/activemq/browse/AMQ-1452 and
...
https://issues.apache.org/activemq/browse/AMQ-729
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@586580 13f79535-47bb-0310-9956-ffa450edef68
2007-10-19 19:01:10 +00:00
Hiram R. Chirino
4f8a1e6d6b
Reduced the amount of time that the synchronizations are held to avoid deadlocks
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@586460 13f79535-47bb-0310-9956-ffa450edef68
2007-10-19 13:56:37 +00:00
Jonas B. Lim
1ea24bff37
applied patch for AMQ-1440 and AMQ-1439
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@586251 13f79535-47bb-0310-9956-ffa450edef68
2007-10-19 03:54:45 +00:00
Hiram R. Chirino
fe8bc3317c
The VM transport could deadlock between the iterate() method and the oneway() method when the async message buffer used by the transport fills up. Change the synchronization logic to make use the a Valve to avoid needing to lock mutexes for so long.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@586185 13f79535-47bb-0310-9956-ffa450edef68
2007-10-19 00:00:45 +00:00
Robert Davies
49325b60cd
Check for duplicates
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@586025 13f79535-47bb-0310-9956-ffa450edef68
2007-10-18 16:22:07 +00:00
Robert Davies
2cb2119814
fix for https://issues.apache.org/activemq/browse/AMQ-1467
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@585967 13f79535-47bb-0310-9956-ffa450edef68
2007-10-18 14:08:44 +00:00
Robert Davies
393a861e89
updated for https://issues.apache.org/activemq/browse/AMQ-1251
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@585853 13f79535-47bb-0310-9956-ffa450edef68
2007-10-18 04:10:37 +00:00
Robert Davies
64bec6b133
Test case for https://issues.apache.org/activemq/browse/AMQ-1202
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@585843 13f79535-47bb-0310-9956-ffa450edef68
2007-10-18 03:53:45 +00:00
Jonas B. Lim
89f793efb0
updates for https://issues.apache.org/activemq/browse/AMQ-1311
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@585413 13f79535-47bb-0310-9956-ffa450edef68
2007-10-17 08:47:38 +00:00
Robert Davies
0da68b4cb3
Make producerFlowControl configurable per Destination
...
default=true
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@585375 13f79535-47bb-0310-9956-ffa450edef68
2007-10-17 05:05:50 +00:00
Robert Davies
4c137cd2bc
don't wait for ever to stop
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@585215 13f79535-47bb-0310-9956-ffa450edef68
2007-10-16 18:25:17 +00:00
Hiram R. Chirino
9da7e31a33
Updated the flow control logic for the Topic case to match what we are using for the Queue case
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@585187 13f79535-47bb-0310-9956-ffa450edef68
2007-10-16 16:22:08 +00:00