gtully
dbb1d8b83d
https://issues.apache.org/jira/browse/AMQ-5513 - have lastDeliveredSequence -1 indicate nothing was received, respect this value in queue sub remove and durable sub deactivate. 0 still constitutes no info - so old clients see same behaviour as before
2015-01-09 13:30:59 +00:00
Hadrian Zbarcea
aedcae139b
Revert "[maven-release-plugin] prepare release activemq-5.11.0"
...
This reverts commit 48b0cf396c
.
2015-01-05 12:25:58 -05:00
Hadrian Zbarcea
89995f4723
Revert "[maven-release-plugin] prepare for next development iteration"
...
This reverts commit 7b285c6f52
.
2015-01-05 12:25:47 -05:00
Dejan Bosanac
7b285c6f52
[maven-release-plugin] prepare for next development iteration
2014-12-29 12:44:32 +01:00
Dejan Bosanac
48b0cf396c
[maven-release-plugin] prepare release activemq-5.11.0
2014-12-29 12:44:20 +01:00
gtully
815e0ec5bf
https://issues.apache.org/jira/browse/AMQ-5495 - apply suggested changes to allow keyStoreKeyPassword to be specified in ActiveMQSslConnectionFactory
2014-12-22 15:26:40 +00:00
gtully
2d9959a6f6
https://issues.apache.org/jira/browse/AMQ-5476 - ZeroPrefetchConsumerTest regression - fix default in connection factory and refactor prefetchExtension support - https://issues.apache.org/activemq/browse/AMQ-2560
2014-12-15 14:21:47 +00:00
gtully
d25c52ccb2
https://issues.apache.org/jira/browse/AMQ-5483 - fix and test - assigned group counts are updated when lru map evicts a group assignment
2014-12-11 14:42:00 +00:00
Timothy Bish
1409acb36e
https://issues.apache.org/jira/browse/AMQ-5480
...
Give the user more rope.
2014-12-10 16:52:13 -05:00
gtully
bbb2acca2f
https://issues.apache.org/jira/browse/AMQ-5476 - fix and test - https://issues.apache.org/jira/browse/AMQ-2790 - default messagePrioritySupported=false
2014-12-05 14:49:48 +00:00
gtully
60ad053486
https://issues.apache.org/jira/browse/AMQ-2719 - resolve possible skipped dispatch - https://issues.apache.org/jira/browse/AMQ-2106 - remove overload so that distribution order is not compromised when consumers are removed with a valid last delivered sequence. Additional test that uses consumer recreation to redistribute groups
2014-12-05 13:59:04 +00:00
gtully
a58b00872c
https://issues.apache.org/jira/browse/AMQ-5472 - deterministiclally propagate root cause exception to listeners on force close due to security excepition on connect, fix and test
2014-12-03 12:16:59 +00:00
Timothy Bish
0514fcf882
https://issues.apache.org/jira/browse/AMQ-5442
...
Add check to avoid any NPE from stop without start called.
2014-11-25 15:30:13 -05:00
gtully
8533a9242b
https://issues.apache.org/jira/browse/AMQ-5450 - ensure default any destination is not chosen in favour of wildcard matches for mKahadb
2014-11-24 17:43:41 +00:00
Dejan Bosanac
dffccb1c7d
https://issues.apache.org/jira/browse/AMQ-5417 - use proper classloader in TaskRunnerFactory
2014-10-29 11:30:15 +01:00
Timothy Bish
1948fe41a3
https://issues.apache.org/jira/browse/AMQ-5407
...
Allow config of enabled protocols for nio+ssl and stomp+nio+ssl etc to
match the capability of the non-nio transports.
2014-10-23 15:03:35 -04:00
Timothy Bish
642cc43216
https://issues.apache.org/jira/browse/AMQ-5406
...
Add support for disable of consumer expiration checks.
2014-10-22 14:42:45 -04:00
Timothy Bish
6c4f15e220
https://issues.apache.org/jira/browse/AMQ-5381
...
Apply fix and test for error when restoring old content and treating it
as compressed when it was not.
2014-10-21 17:14:47 -04:00
gtully
57fc29b6ce
remove npe when no jars on classpath, in ide
2014-10-07 14:50:41 +01:00
gtully
54e2e3bef2
rework cursor store sync w.r.t to index order. resolve issues with skipped dispatch and duplicate dispatch. https://issues.apache.org/jira/browse/AMQ-4485 https://issues.apache.org/jira/browse/AMQ-5266
2014-08-30 00:51:21 +01:00
Dejan Bosanac
b9696ac80b
https://issues.apache.org/jira/browse/AMQ-5333 - make xpath parser features configurable
2014-08-26 14:47:06 +02:00
Timothy Bish
6e9ecdfe21
https://issues.apache.org/jira/browse/AMQ-5281
...
Apply patch correctly honor JMS selector behavior for unknown values.
2014-08-18 13:23:56 -04:00
Timothy Bish
b1bc593931
https://issues.apache.org/jira/browse/AMQ-5323
2014-08-15 14:23:14 -04:00
Timothy Bish
deee040151
Make comments match reality.
2014-08-14 18:17:30 -04:00
Timothy Bish
9a6d444e0a
https://issues.apache.org/jira/browse/AMQ-5320
...
Clean up API docs.
2014-08-13 09:50:41 -04:00
gtully
ab1e9c78ef
https://issues.apache.org/jira/browse/AMQ-5311 - encode xaErrorCode in xaexception message
2014-08-07 13:42:10 +01:00
gtully
58ae402b1d
https://issues.apache.org/jira/browse/AMQ-5016 - evolve the class in a serialization compat way so that exiting kahadb stores can be read, long field addition
2014-08-06 15:21:19 +01:00
gtully
207d4cdee6
https://issues.apache.org/jira/browse/AMQ-5080 - revert short circut of recover when failover transport is not connected - using maxstartupMaxReconnectAttempts=x provides a better alternative. tm recovery need not start a managed connection or call getConnection before a call to xaresource.recover
2014-07-28 16:19:20 +01:00
gtully
e1cd19e86e
https://issues.apache.org/jira/browse/AMQ-5080 - some additional trace logging
2014-07-24 15:19:16 +01:00
Timothy Bish
d54e0d6ab5
https://issues.apache.org/jira/browse/AMQ-5198
...
member variable scheduler assignment escapes the synchronization block
before the scheduler instance is fully initialized.
2014-07-18 10:11:25 -04:00
gtully
c34851fd57
https://issues.apache.org/jira/browse/AMQ-5279 - ensure poison on failover redelivery only when delivery is not pending else where
2014-07-17 17:08:13 +01:00
Timothy Bish
e957937f08
https://issues.apache.org/jira/browse/AMQ-5269
...
Use a selector based accept when the transport socket has a selectable
channel which is the case for all the NIO transport. Can reduce the
time it takes to close down the transport speeding up tests.
2014-07-10 16:32:44 -04:00
Daniel Kulp
06bb7a2716
Update poms to fully load into M2E
2014-07-10 13:47:55 -04:00
Timothy Bish
106f759571
https://issues.apache.org/jira/browse/AMQ-5251
...
Synchronize method and remove old deprecated schedule method.
2014-06-28 10:21:34 -04:00
gtully
ce911bafbf
https://issues.apache.org/jira/browse/AMQ-5241 - track window between sending shutdown info and doing local close to avoid race with broker on normal connection.close - needs two jvm to reliably reproduce so no unit test with the fix
2014-06-23 12:13:45 +01:00
Timothy Bish
8824ac9fcb
https://issues.apache.org/jira/browse/AMQ-5231
...
Only apply timeout to the Message sends, other commands are handled
separately as needed.
2014-06-18 12:58:50 -04:00
Timothy Bish
91a0041915
https://issues.apache.org/jira/browse/AMQ-5016
...
Added test and a fix.
2014-06-11 14:20:00 -04:00
Timothy Bish
b1d46e45c6
https://issues.apache.org/jira/browse/AMQ-5211
...
Throw an exception if the destination name is empty.
2014-06-06 12:05:17 -04:00
Dejan Bosanac
fa086396a7
[maven-release-plugin] prepare for next development iteration
2014-06-05 11:59:29 +02:00
Dejan Bosanac
58dd93e42e
[maven-release-plugin] prepare release activemq-5.10.0
2014-06-05 11:59:17 +02:00
Timothy Bish
6c703ac6ee
https://issues.apache.org/jira/browse/AMQ-5209
...
Add MessageId and original destination info to the advisory message
properties.
2014-06-04 13:30:42 -04:00
Dejan Bosanac
c2cf78542f
[maven-release-plugin] prepare for next development iteration
2014-06-04 11:33:17 +02:00
Dejan Bosanac
5bc741f227
[maven-release-plugin] prepare release activemq-5.10.0
2014-06-04 11:33:03 +02:00
Timothy Bish
210e39df8b
https://issues.apache.org/jira/browse/AMQ-5144
...
Fix issue where the writer would go into a cycle of adding delay for
writes of large messages where each packet ended up as the same size.
2014-05-08 12:56:54 -04:00
Timothy Bish
53b12820c2
https://issues.apache.org/jira/browse/AMQ-5171
...
Make the type suffix configurable. Clean up logging calls.
2014-05-05 11:15:42 -04:00
Dhiraj Bokde
94b404d0ab
Fixed AMQ-5160, allowed wildcard subscriptions for future destinations, added tests for wildcard authorization, fixed consumer and producer AdvisoryTopic names for composite destinations by replacing ',' with '‚'
2014-05-05 10:06:06 +02:00
gtully
ad1f751a41
https://issues.apache.org/jira/browse/AMQ-5077 - reduce reader thread work when client uses async send; async store updates can now queue up to the destination memory limit b/c they don't block the send thread. Pending store writes are now tracked in memory usage. This allows a client to quickly provide a burst of messages to fill the destination cache bounded only by network bandwidth
2014-04-30 16:13:18 +01:00
Hadrian Zbarcea
3845aaa43b
Ignore crashing test in stomp, improve test timing
2014-04-29 15:17:17 -04:00
Timothy Bish
a88e19e7cd
https://issues.apache.org/jira/browse/AMQ-5163
...
Allow for durable topic consumers to use individual ack mode.
2014-04-28 14:03:43 -04:00
Dejan Bosanac
ec35588e56
https://issues.apache.org/jira/browse/AMQ-4182 - remove remaining use of finalize()
2014-04-24 16:06:01 +02:00
gtully
f70dc74312
https://issues.apache.org/jira/browse/AMQ-5146 - durable sub redelivery test regression https://issues.apache.org/jira/browse/AMQ-5156 - pre delivery check for max redelivery should only apply to transacted sessions
2014-04-24 10:53:33 +01:00
Dejan Bosanac
44bb9fbeae
https://issues.apache.org/jira/browse/AMQ-4182 - explicitly comporess/decompress byte messages, so we can avoid using finalize() to close streams
2014-04-23 12:46:01 +02:00
gtully
fad1dd0f17
https://issues.apache.org/jira/browse/AMQ-5146 - validate redeliveryPolicy excess pre dispatch, fix and test
2014-04-16 15:49:34 +01:00
gtully
c07514f570
https://issues.apache.org/jira/browse/AMQ-5119 - fix (pfox thanks for the test) the marshalled properties were being retained so a property removal was being ignored before the schedualed resend
2014-03-27 15:12:12 +00:00
Kevin Earls
5e14eecce6
Fix for AMQ-5099, removed dead code
2014-03-19 19:00:34 +01:00
gtully
b136df177f
https://issues.apache.org/jira/browse/AMQ-5089 - fix and test, respect client ack for topics and only decrement counters when ack is received
2014-03-19 15:33:44 +00:00
Dejan Bosanac
8188f7f884
https://issues.apache.org/jira/browse/AMQ-5090 - improve failover transaction tracking
2014-03-07 12:04:49 +01:00
gtully
33b88d34a9
https://issues.apache.org/jira/browse/AMQ-5087 fix and test
2014-03-06 22:40:01 +00:00
gtully
cfe099d1cc
rework https://issues.apache.org/jira/browse/AMQ-3305 in the context of https://issues.apache.org/jira/browse/AMQ-4952 dlq processing of duplicates, also possible missed dispatch with interleaved xa completion and new messages - recovered transactions are now individually tracked by the store and replayed in the next batch, which negates the need to flush the cursor and avoids duplicates
2014-03-05 14:51:05 +00:00
Hadrian Zbarcea
efcef4533e
speed up stopping the tcp transport (saves 2sec for each @Test method)
2014-03-04 18:10:08 -05:00
Hadrian Zbarcea
be94865c44
[cosmetic] Remove unused constructor from abstract class
2014-03-03 23:20:56 -05:00
gtully
e8818fafea
https://issues.apache.org/jira/browse/AMQ-5080 - fix up rar transacted delivery and redelivery processing, xarecovery and transaction completion afer failover - using failover maxReconnectAttempts=0 to avoid blocking periodic recovery and negate replay of aborted transaction state
2014-03-03 13:22:30 +00:00
Hiram Chirino
e7e317dc7e
Applying patch AMQ-5074: MQTT paths with empty levels are not handled correctly.
...
Thanks Dhiraj!
2014-02-24 09:05:23 -05:00
Timothy Bish
2b3c477752
https://issues.apache.org/jira/browse/AMQ-5071
...
fix log statement
2014-02-22 16:45:40 -05:00
Timothy Bish
914beaeb4c
https://issues.apache.org/jira/browse/AMQ-5071
...
fix bad logger
2014-02-21 12:15:28 -05:00
Hadrian Zbarcea
7b555c2898
AMQ-5047. Fix packaging issues related to maven version
2014-02-15 16:15:04 -05:00
Hiram Chirino
93ca04468b
Implements AMQ-5054: Display the number of active transactions and age of oldest transaction on a Connection's JMX info
2014-02-14 16:22:50 -05:00
Hiram Chirino
190a44bf25
Implements AMQ-5050: Populate a 'Host' header in the WireFormatInfo of the Openwire protocol to let multi-tenant proxies route connections.
2014-02-13 14:15:20 -05:00
Hiram Chirino
e2a7d6af5a
More improvements for AMQ-5043.
2014-02-12 10:59:40 -05:00
Dejan Bosanac
084d606d89
improve failover transport failure message to include client port, which makes will make it easier to debug things in multi-connection clients
2014-02-12 14:29:23 +01:00
Hiram Chirino
9735806030
Attempts to fix many of the compatibility issues with MQTT highlighted by AMQ-5043.
2014-02-11 17:53:24 -05:00
gtully
221a751d0a
https://issues.apache.org/jira/browse/AMQ-5031 - add connection factory rmIdFromConnectionId attribute to allow resource manager identity to be mapped to the connection id, thus overiding the default broker identity association. usefull is a TM does not end a start with the join flags. We may want to implement join but it is not trivial to determin the existing associated state and clear it
2014-02-06 15:18:30 +00:00
artnaseef
50e4d07842
Small change to verify repo access.
2014-02-06 02:28:15 -07:00
gtully
146fb12108
ensure stack trace is in trace logging of exception
2014-02-05 11:25:44 +00:00
Timothy Bish
9eb7fb9062
https://issues.apache.org/jira/browse/AMQ-5017
...
Enforce max prefetch limit even in setAll and set inputstream using all
value.
2014-02-04 10:38:42 -05:00
Kevin Earls
c027552035
Upgraded surefire plugin to 2.16. AMQ-5006
2014-01-30 14:22:44 +01:00
Timothy Bish
c7d66e944d
https://issues.apache.org/jira/browse/AMQ-5003
...
Gate the session clear in progress code so that overlapping
transportInterrupted calls don't start consuming lots of memory for no
reason.
2014-01-29 16:57:33 -05:00
Timothy Bish
d8cd37030b
https://issues.apache.org/jira/browse/AMQ-4989
2014-01-22 17:48:11 -05:00
Timothy Bish
90104943b2
https://issues.apache.org/jira/browse/AMQ-4839
...
Deprecated the streams functionality. Remove in a later release.
2014-01-21 15:00:16 -05:00
Timothy Bish
e7703f70e0
https://issues.apache.org/jira/browse/AMQ-4977
...
Don't increase the cache size for repeated pull commands for the same
destination + consumer combo since we only keep one instance in the map
at any given time.
2014-01-17 12:29:55 -05:00
gtully
40c09ed5e5
add flags to xa_* debug logging
2014-01-16 14:02:09 +00:00
Timothy Bish
04c6d9dd69
https://issues.apache.org/jira/browse/AMQ-4958
...
Don't swallow evidence of interrupted state.
2014-01-06 11:49:38 -05:00
Torsten Mielke
f69cbd8ec6
AMQ-4950: java.lang.ClassCastException: org.apache.activemq.command.ExceptionResponse cannot be cast to org.apache.activemq.command.IntegerResponse, attempting to automatically reconnect
2014-01-06 13:43:26 +01:00
Timothy Bish
cb5c29d02d
https://issues.apache.org/jira/browse/AMQ-4887
...
Fix for losing message content when reusing messages.
2013-12-13 10:54:58 -05:00
rajdavies
6683eb652f
Fix for https://issues.apache.org/jira/browse/AMQ-4927
2013-12-10 13:36:09 +00:00
rajdavies
71e4585689
Fix for https://issues.apache.org/jira/browse/AMQ-4825
2013-12-10 09:10:33 +00:00
Christian Posta
b21dc69e81
added time unit for "send timeout" in the javadocs
2013-12-09 09:14:38 -07:00
rajdavies
489f929686
Fix for https://issues.apache.org/jira/browse/AMQ-4918
2013-12-04 19:02:25 +00:00
Hiram Chirino
02ef9445dd
Fixing bug where the DataByteArrayInputStream was not throwing EOFExceptions when reads were going past the end of the byte array.
...
This would make it harder to figure out when things went wrong.
2013-12-04 12:09:47 -05:00
Timothy Bish
69e35d6c4a
https://issues.apache.org/jira/browse/AMQ-4889
...
Improve the stream close logic in the init method to ensure we don't
leak and resources.
2013-12-04 11:09:28 -05:00
Rob Davies
07ec890372
Fix for https://issues.apache.org/jira/browse/AMQ-4916
2013-12-03 17:15:56 +00:00
Timothy Bish
a6e306437e
fix for: https://issues.apache.org/jira/browse/AMQ-4893
2013-11-25 14:48:38 -05:00
Dejan Bosanac
bc1ca6c8cf
https://issues.apache.org/jira/browse/AMQ-4897 - race condition in failover transport
2013-11-19 12:41:10 +01:00
rajdavies
0a67b12c64
Fix for https://issues.apache.org/jira/browse/AMQ-4884
2013-11-14 09:48:34 +00:00
Timothy Bish
c55a666921
https://issues.apache.org/jira/browse/AMQ-4706
...
add setting warnAfterReconnectAttempts to FailoverTransport to log a
warning after every N retries. A value of <= 0 will disable the
warnings.
2013-11-13 15:19:16 -05:00
rajdavies
7f639a6047
Fix for https://issues.apache.org/jira/browse/AMQ-4884
2013-11-13 18:50:57 +00:00
Claus Ibsen
6ed8f43d8d
AMQ-2505: Sanitize hostname in Id generator to only include ascii chars as otherwise this can cause problems in openwire protocol.
2013-11-13 16:37:49 +01:00
Rob Davies
4183e6e47c
Fix for https://issues.apache.org/jira/browse/AMQ-4719
2013-11-12 08:22:19 +00:00
Rob Davies
7e000d5a40
Fix for https://issues.apache.org/jira/browse/AMQ-4719
2013-11-12 08:07:33 +00:00
Timothy Bish
8f078a3f4c
https://issues.apache.org/jira/browse/AMQ-4853
...
Add hashCode and equals override so that this object can be used in
collections properly
2013-11-08 16:27:13 -05:00
Claus Ibsen
af1edf4588
Polished
2013-11-03 11:52:44 +01:00
Claus Ibsen
06356db1c4
AMQ-4826: Failover transport - avoid floating-point issue on other JDKs.
2013-11-03 11:00:03 +01:00
Claus Ibsen
6e49ef3a60
AMQ-4746: Fixed ClassLoadingAwareObjectInputStream to load simple types first, using same logic as in Camel. This helps with AMQ clients in other runtimes such as Applet based or whatnot.
2013-11-02 15:24:01 +01:00
Claus Ibsen
7dfb0a2a3c
AMQ-4433: Validate socket.xxx transport connector options, to detect invalud/unused options and fail. Thanks to Christoffer Sawicki for the patch.
2013-10-31 12:13:40 +01:00
gtully
864aa6798f
[maven-release-plugin] prepare for next development iteration
2013-10-14 23:38:35 +01:00
gtully
87c9bbebac
[maven-release-plugin] prepare release activemq-5.9.0
2013-10-14 23:38:22 +01:00
gtully
ee0933c71e
[maven-release-plugin] prepare for next development iteration
2013-10-11 14:51:36 +01:00
gtully
b276006911
[maven-release-plugin] prepare release activemq-5.9.0
2013-10-11 14:51:24 +01:00
gtully
839b154cd2
https://issues.apache.org/jira/browse/AMQ-4798 - limits are still high but there is no loss in percision so that chidren now match parent and there is no info message
2013-10-11 13:56:44 +01:00
rajdavies
ccb119d896
Construct a ConsumerId from a String
2013-10-10 20:30:01 +01:00
gtully
dc0291b290
https://issues.apache.org/jira/browse/AMQ-4791 - fix and test. removed the delay but left the warn if dispatch ocurrs before interruption processing is complete. Problem was a race between consumer close and sessions copy on write dispatchers list
2013-10-08 21:29:17 +01:00
gtully
4f19f31a37
https://issues.apache.org/jira/browse/AMQ-4785 - fix and test
2013-10-04 11:35:23 +01:00
Claus Ibsen
887ac0ba49
AMQ-4769: Connection.close() should not throw exception if already closed according to JMS spec/javadoc.
2013-10-02 15:25:01 +02:00
gtully
b66559ee07
https://issues.apache.org/jira/browse/AMQ-4757 activemq-jms-pool a generic jms xa pool derived from activemq-pool which activemq-pool now extends with amq specifics
2013-09-30 23:09:25 +01:00
Timothy Bish
c7d33ad5e4
Logging cleanup, don't need all the if checks, use string substitution
...
more effectively.
2013-09-19 15:19:24 -04:00
gtully
c387522217
https://issues.apache.org/jira/browse/AMQ-4426 - default to client ack, so that if a tx aborts we never auto ack or start a local transaction
2013-09-19 16:26:52 +01:00
Hiram Chirino
5215fc21d6
Fixing regression due to chagnes in AMQ-4718. You now have to prefix option that need to passed to the nested urls by prefixing those options with 'nested.'
2013-09-18 10:14:07 -04:00
gtully
dd91e8592e
https://issues.apache.org/jira/browse/AMQ-4092 - resolve by removing dynamic property modification - JMSXGroupFirstForConsumer is now a message attribute with a property accessor
2013-09-17 11:03:57 +01:00
Hiram Chirino
272b846b0c
Fixes AMQ-4723: HTTP Discovery agent should only poll for broker URLs while attempting to connect a transport.
2013-09-12 11:16:34 -04:00
Hiram Chirino
0ff359341c
Fixes AMQ-4718: Extra options added to a failover/discovery URL that don't map to failover configuration settings, should get passed to the nested URLs.
2013-09-10 12:56:25 -04:00
Timothy Bish
ce5d2a9e9e
https://issues.apache.org/jira/browse/AMQ-4205
...
Allow for tuning to thread pool keep alive times as system properties.
2013-09-04 14:16:51 -04:00
Dejan Bosanac
a0c1781c4e
https://issues.apache.org/jira/browse/AMQ-4711 - totalMessageCount stat is not decremented after destination removal
2013-09-03 10:22:25 +02:00
Gary Tully
feb71c3c6e
https://issues.apache.org/jira/browse/AMQ-4482 - implement and test setPercentOfJvmHeap attribute on memory usage
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1518263 13f79535-47bb-0310-9956-ffa450edef68
2013-08-28 15:37:28 +00:00
Robert Davies
0d98623b7b
Added SizeStatisicsImpl for https://issues.apache.org/jira/browse/AMQ-4697
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1518217 13f79535-47bb-0310-9956-ffa450edef68
2013-08-28 14:32:45 +00:00
Robert Davies
6585d5c874
check connection isn't null before asking for it's BlobTransferPolicy
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1517230 13f79535-47bb-0310-9956-ffa450edef68
2013-08-25 07:22:34 +00:00
Robert Davies
eb99e05d3a
Added isEmpty() on DestinationMap
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1516803 13f79535-47bb-0310-9956-ffa450edef68
2013-08-23 10:12:25 +00:00
Hiram R. Chirino
40aa15ce52
Make sure the LRUCache key is always a String.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1515854 13f79535-47bb-0310-9956-ffa450edef68
2013-08-20 16:05:35 +00:00
Hiram R. Chirino
45e1462609
Persist the latest producer position across restarts in the leveldb store.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1515799 13f79535-47bb-0310-9956-ffa450edef68
2013-08-20 12:38:32 +00:00
Gary Tully
f155083a61
use valid error code (in place of xa_ok) for xaexceptions in the absense of marshalled exception content from the broker
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1515783 13f79535-47bb-0310-9956-ffa450edef68
2013-08-20 11:21:43 +00:00
Gary Tully
25a1dd071a
https://issues.apache.org/jira/browse/AMQ-4682 - implement network connector modification, match, stop, apply restart
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1515461 13f79535-47bb-0310-9956-ffa450edef68
2013-08-19 15:18:55 +00:00
Timothy A. Bish
1773e2c11c
fix for: https://issues.apache.org/jira/browse/AMQ-4582
...
treat bad enabledCipherSuites option as non-recoverable.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1512017 13f79535-47bb-0310-9956-ffa450edef68
2013-08-08 20:26:23 +00:00
Hiram R. Chirino
dd286e2381
Fixes AMQ-4672 - [JMS Client] Set the SNI field on SSL connections
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1511335 13f79535-47bb-0310-9956-ffa450edef68
2013-08-07 14:42:31 +00:00
Gary Tully
82c4ab83ed
https://issues.apache.org/jira/browse/AMQ-4665 - fix auto ack on duplicate, now use poison ack. For client ack allow replay after failover. Additional tests to validate new behaviour
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1511307 13f79535-47bb-0310-9956-ffa450edef68
2013-08-07 13:39:24 +00:00
Gary Tully
13bbe52646
https://issues.apache.org/jira/browse/AMQ-4643 - ensure handled ioexceptions are not propagated back to client when broker or transports are shutdown. additional tests existing tests refactored to reflect new determinism. IOException handler now throws SuppressReplyException which is trapped by the transport connector. If store exception need to be processes by the client, for immediate response rather than failover reconnect, then the ioexception handler should be configured to ignoreAllErrors
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1508602 13f79535-47bb-0310-9956-ffa450edef68
2013-07-30 20:18:07 +00:00
Gary Tully
20f384ce59
https://issues.apache.org/jira/browse/AMQ-4637 - track cause and policy
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1505000 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 20:20:08 +00:00
Timothy A. Bish
0826fdcf06
AMQ-4637 fix test that fails due to this change, also remove extra call to setPoisonCause
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1504954 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 18:21:09 +00:00
Gary Tully
a971b648ea
https://issues.apache.org/jira/browse/AMQ-4637 - populate DLQ_DELIVERY_FAILURE_CAUSE_PROPERTY for messages that exceed a redelivery policy - makes it easier to identify in the dlq
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1504423 13f79535-47bb-0310-9956-ffa450edef68
2013-07-18 10:48:29 +00:00
Gary Tully
1408e7f63b
https://issues.apache.org/jira/browse/AMQ-4634 - create ack with known transaction context so that subesquent timeout triggers a rollback and does not leave a null transaction
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1504279 13f79535-47bb-0310-9956-ffa450edef68
2013-07-17 21:11:37 +00:00
Bosanac Dejan
975b7819cf
https://issues.apache.org/jira/browse/AMQ-4588 - id generator; some improvements in the socket close routine
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1503627 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 09:29:16 +00:00
Timothy A. Bish
b3e58a5b33
Apply patch for: https://issues.apache.org/jira/browse/AMQ-4588
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1500885 13f79535-47bb-0310-9956-ffa450edef68
2013-07-08 19:04:09 +00:00
Timothy A. Bish
d57ebf88f0
fix for: https://issues.apache.org/jira/browse/AMQ-4591
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1500753 13f79535-47bb-0310-9956-ffa450edef68
2013-07-08 14:21:43 +00:00
Gary Tully
a95c6dba1b
https://issues.apache.org/jira/browse/AMQ-4607 - add network connector consumerTTL and messageTTL - split effect of networkTTL - allows a message many hops in a mesh while consumer demand is not repeatildy replicated. Rollback cursor aduit on forward so a message can be redispatched on redelivery. Additional test to verify multiple hops back to origin. Allow infinite ttl or hops with -1 https://issues.apache.org/jira/browse/AMQ-2180 .
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1497716 13f79535-47bb-0310-9956-ffa450edef68
2013-06-28 10:32:40 +00:00
Timothy A. Bish
a0cc2af059
Shorten the test
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1490034 13f79535-47bb-0310-9956-ffa450edef68
2013-06-05 21:10:50 +00:00
Timothy A. Bish
d97f28c490
fix for: https://issues.apache.org/jira/browse/AMQ-4487 and https://issues.apache.org/jira/browse/AMQ-4372
...
Additional testing and updates.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1490032 13f79535-47bb-0310-9956-ffa450edef68
2013-06-05 21:06:39 +00:00
Timothy A. Bish
01cda8582a
Fix test failure after recent MessageId changes.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1489994 13f79535-47bb-0310-9956-ffa450edef68
2013-06-05 18:29:35 +00:00
Timothy A. Bish
368dc8f26a
Fix MessageId copy, wasn't copying the new textView field. Fixes failing test.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1489618 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 21:24:59 +00:00
Hiram R. Chirino
eec7d7404a
Related to AMQ-4563: Added test cases where we select against the JMSMessageID and fixed a bug that was causing it to fail.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1488376 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 19:56:12 +00:00
Hiram R. Chirino
34e8331829
Part of AMQ-4563: Include the textView as part of the persisted fields in OpenWire 10.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1488354 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 18:53:56 +00:00
Hiram R. Chirino
b2b4fc81f7
Fix for AMQ-4563: Changes the KahaDB store to use a more consistent key for message ids. MessageId.toString can change depending on how the message was encoded.
...
Support storing the externally generated message id of a message in the MessageID class so that Selectors can operate against that external message id.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1488353 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 18:53:48 +00:00
Timothy A. Bish
c90322fff0
fix for: https://issues.apache.org/jira/browse/AMQ-4562
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1487874 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 14:28:29 +00:00
Timothy A. Bish
97e1edc20c
Fix test failure
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1487607 13f79535-47bb-0310-9956-ffa450edef68
2013-05-29 19:32:51 +00:00
Timothy A. Bish
067660ce88
fix and test for: https://issues.apache.org/jira/browse/AMQ-4542
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1487018 13f79535-47bb-0310-9956-ffa450edef68
2013-05-28 17:43:07 +00:00
Bosanac Dejan
9490793f2c
https://issues.apache.org/jira/browse/AMQ-4461 - priority backup should not be restricted by the pool size
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1486869 13f79535-47bb-0310-9956-ffa450edef68
2013-05-28 11:17:17 +00:00
Timothy A. Bish
3ff2d9294c
fix and test for: https://issues.apache.org/jira/browse/AMQ-4554
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1486225 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 21:38:04 +00:00
Bosanac Dejan
2dd1335b20
https://issues.apache.org/jira/browse/AMQ-4000 - bumping openwire version to 10
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1483902 13f79535-47bb-0310-9956-ffa450edef68
2013-05-17 16:27:35 +00:00
Bosanac Dejan
620523a597
https://issues.apache.org/jira/browse/AMQ-4000 - initial implementation of keeping track of durable subscribers over network and unregister them appropriately
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1483827 13f79535-47bb-0310-9956-ffa450edef68
2013-05-17 14:27:48 +00:00
Gary Tully
6f124c16f7
https://issues.apache.org/jira/browse/AMQ-4539 - add JMSActiveMQBrokerPath string property and brokerPath attribute via jmx message view, the list length is the current number of network hops
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1483600 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 23:03:17 +00:00
Timothy A. Bish
ce67624cd4
Fix and test for: https://issues.apache.org/jira/browse/AMQ-4484
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1482017 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 18:24:33 +00:00
Timothy A. Bish
e731c39af7
ix and test for: https://issues.apache.org/jira/browse/AMQ-4531
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1481984 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 17:45:18 +00:00
Hiram R. Chirino
30038957b6
Add a storeConentAndClear() method to message so that we can lower the memory impact of embedded broker usage.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1481527 13f79535-47bb-0310-9956-ffa450edef68
2013-05-12 11:23:30 +00:00
Timothy A. Bish
b820ac2bf9
fix for: https://issues.apache.org/jira/browse/AMQ-4512
...
Usage and MemoryUsage sync fixes to keep state consistent during thread contention. Test case added.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1481106 13f79535-47bb-0310-9956-ffa450edef68
2013-05-10 17:13:48 +00:00
Hiram R. Chirino
d344aa7a42
Fixes AMQ-4529: leveldb store NPEs when you send to a composite destination.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1481013 13f79535-47bb-0310-9956-ffa450edef68
2013-05-10 14:03:31 +00:00
Gary Tully
864fdbebef
https://issues.apache.org/jira/browse/AMQ-4428 - patch applied with thanks - errors are now logged and throwables propagate
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1479852 13f79535-47bb-0310-9956-ffa450edef68
2013-05-07 10:51:40 +00:00
Gary Tully
bf071376b5
https://issues.apache.org/jira/browse/AMQ-3097 - apply patch with some additional unit test, with thanks
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1478973 13f79535-47bb-0310-9956-ffa450edef68
2013-05-03 20:43:59 +00:00
Timothy A. Bish
3a8eb74a9f
Fix and test for: https://issues.apache.org/jira/browse/AMQ-4505
...
When a broker was stopping it was sending out a cluster update after tearing down its bridges so any client connected to it would lose its awareness of other brokers in the cluster.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1478835 13f79535-47bb-0310-9956-ffa450edef68
2013-05-03 15:21:25 +00:00
Gary Tully
d687324465
https://issues.apache.org/jira/browse/AMQ-4507 - apply fix with thanks
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1478357 13f79535-47bb-0310-9956-ffa450edef68
2013-05-02 13:03:04 +00:00
Timothy A. Bish
e777126d30
fix for: https://issues.apache.org/jira/browse/AMQ-4501
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1478184 13f79535-47bb-0310-9956-ffa450edef68
2013-05-01 20:53:51 +00:00
Timothy A. Bish
fbac51c8f8
https://issues.apache.org/jira/browse/AMQ-4501
...
Partial fix, perform a proper URI comparison to avoid an unnecessary reconnect bounce.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1478083 13f79535-47bb-0310-9956-ffa450edef68
2013-05-01 16:33:57 +00:00
Hiram R. Chirino
163ad5d4a9
Fix for AMQ4472: We can eagerly close a txed consumer if it has not delivered any messages.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1471673 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 21:01:24 +00:00
Timothy A. Bish
3f9b6ed391
fix and test for: https://issues.apache.org/jira/browse/AMQ-4469
...
Rewrote the unit test as a JUnit 4 test and remove hard coded 61616 port dep.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1467510 13f79535-47bb-0310-9956-ffa450edef68
2013-04-12 23:02:48 +00:00
Bosanac Dejan
15affd0755
https://issues.apache.org/jira/browse/AMQ-3706 - improve rebalance distribution which is more apparent when only two brokers are involved
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1467241 13f79535-47bb-0310-9956-ffa450edef68
2013-04-12 11:52:15 +00:00
Timothy A. Bish
2aff82c47a
fix and test for: https://issues.apache.org/jira/browse/AMQ-4464
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1466131 13f79535-47bb-0310-9956-ffa450edef68
2013-04-09 17:05:21 +00:00
Bosanac Dejan
585a966a9b
https://issues.apache.org/jira/browse/AMQ-4461 - priority backup with multiple brokers
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1465683 13f79535-47bb-0310-9956-ffa450edef68
2013-04-08 16:58:21 +00:00
Timothy A. Bish
77fe814b9e
fix for: https://issues.apache.org/jira/browse/AMQ-4435
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1464568 13f79535-47bb-0310-9956-ffa450edef68
2013-04-04 14:33:09 +00:00
Timothy A. Bish
8e388b86d6
fix and test for: https://issues.apache.org/jira/browse/AMQ-4361
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1464165 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 19:22:16 +00:00
Bosanac Dejan
148ca81dcd
https://issues.apache.org/jira/browse/AMQ-4397 - xss in cron expressions
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1459265 13f79535-47bb-0310-9956-ffa450edef68
2013-03-21 12:34:01 +00:00
Timothy A. Bish
f87f56294d
fix and test for: https://issues.apache.org/jira/browse/AMQ-4373
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1456485 13f79535-47bb-0310-9956-ffa450edef68
2013-03-14 15:38:01 +00:00
Gary Tully
885b8c9775
fix up tck violation on xasession interface after close expectations
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1454422 13f79535-47bb-0310-9956-ffa450edef68
2013-03-08 15:22:17 +00:00
Gary Tully
fc15f130d1
https://issues.apache.org/jira/browse/AMQ-4362 - Broker-based redelivery plugin - support for maximumRedeliveries="-1"
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1454330 13f79535-47bb-0310-9956-ffa450edef68
2013-03-08 11:43:46 +00:00
Timothy A. Bish
7809e8067e
fix and test for: https://issues.apache.org/jira/browse/AMQ-4321
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1446348 13f79535-47bb-0310-9956-ffa450edef68
2013-02-14 21:42:16 +00:00
Christian Posta
2c3d947b69
Fix for https://issues.apache.org/jira/browse/AMQ-4309 Add usage limit check when limit for destinations is present
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1445474 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 05:18:21 +00:00
Timothy A. Bish
2a64e88bd0
apply patch for: https://issues.apache.org/jira/browse/AMQ-4312
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1445436 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 00:39:57 +00:00
Gary Tully
56174e770d
[maven-release-plugin] prepare for next development iteration
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1443026 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 15:45:26 +00:00
Gary Tully
5e257808f3
[maven-release-plugin] prepare release activemq-5.8.0
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1443024 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 15:43:41 +00:00
Gary Tully
436ca9e1eb
fix Warning: Line 26, Column 3: Bad option name "OPTIMIZE_TOKEN_MANAGER". Option setting will be ignored.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1441407 13f79535-47bb-0310-9956-ffa450edef68
2013-02-01 12:00:12 +00:00
Timothy A. Bish
849baa6fbc
Apply fix and test for: https://issues.apache.org/jira/browse/AMQ-4116
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1441212 13f79535-47bb-0310-9956-ffa450edef68
2013-01-31 21:50:04 +00:00
Gary Tully
bac1243840
https://issues.apache.org/jira/browse/AMQ-3539 - applying suggested fix, it makes sense. thanks
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1440366 13f79535-47bb-0310-9956-ffa450edef68
2013-01-30 12:12:07 +00:00
Timothy A. Bish
d977b0c9bb
fix https://issues.apache.org/jira/browse/AMQ-4279
...
mark the Udp and Reliable as deprecated.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1440073 13f79535-47bb-0310-9956-ffa450edef68
2013-01-29 19:29:23 +00:00
Timothy A. Bish
a55aae00e7
Scrub the pom files and remove old cruft and leftovers from the recent refactoring
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1439680 13f79535-47bb-0310-9956-ffa450edef68
2013-01-28 22:44:25 +00:00
Gary Tully
9988fff773
tidy logging https://issues.apache.org/jira/browse/AMQ-4276
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1439395 13f79535-47bb-0310-9956-ffa450edef68
2013-01-28 13:19:10 +00:00
Gary Tully
8012f28511
https://issues.apache.org/jira/browse/AMQ-4276 - deal with destnotexist for temps. support alwaysSyncSend for duplex. improve reporting of failures. additional test.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1438734 13f79535-47bb-0310-9956-ffa450edef68
2013-01-25 21:47:17 +00:00
Hiram R. Chirino
37423d661c
When the AMQP source or target address is not set, close the sender/receiver and report the error.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1438540 13f79535-47bb-0310-9956-ffa450edef68
2013-01-25 14:35:18 +00:00
Timothy A. Bish
80d0605682
fix for: https://issues.apache.org/jira/browse/AMQ-4274
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1438209 13f79535-47bb-0310-9956-ffa450edef68
2013-01-24 21:38:33 +00:00
Hiram R. Chirino
3602973cae
Use an escape code for the unicode char to keep java sources using ascii characters.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1437440 13f79535-47bb-0310-9956-ffa450edef68
2013-01-23 15:04:03 +00:00
Timothy A. Bish
ae61847d02
https://issues.apache.org/jira/browse/AMQ-4248
...
Add expanded transmit callback interface so that a failure to transmit can be distinguished from normal operation and allow for no further attempts at dispatch fixing the current NPE when async dispatch is enabled.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1432487 13f79535-47bb-0310-9956-ffa450edef68
2013-01-12 18:13:27 +00:00
Gary Tully
e3626e19bc
https://issues.apache.org/jira/browse/AMQ-4237 - resolve unit test regressions for dynamic networkBridge mbeans
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1430266 13f79535-47bb-0310-9956-ffa450edef68
2013-01-08 13:13:27 +00:00
Timothy A. Bish
b79c9868ec
fix for: https://issues.apache.org/jira/browse/AMQ-4241
...
Add a configuration option to control whether properties are set on every output message or only the first one.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1429909 13f79535-47bb-0310-9956-ffa450edef68
2013-01-07 17:22:30 +00:00
Timothy A. Bish
8a6ebc20a3
cleanup and fix warnings.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428981 13f79535-47bb-0310-9956-ffa450edef68
2013-01-04 17:01:05 +00:00
Timothy A. Bish
f3407fe4b2
Fix broken unit test, openwire.v*.WireFormatInfoTest max property size not set correctly.
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428953 13f79535-47bb-0310-9956-ffa450edef68
2013-01-04 16:22:32 +00:00
Gary Tully
e5d616da50
https://issues.apache.org/jira/browse/AMQ-4160 - fix up multicast discovery regression - it was giving uniqueue events to add/remove. MulticastDiscoveryOnFaultyNetworkTest - added static variant to that test also to validate existing changes
...
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428901 13f79535-47bb-0310-9956-ffa450edef68
2013-01-04 14:48:30 +00:00