Commit Graph

1898 Commits

Author SHA1 Message Date
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 01215e240d Updated version number now that 5.0.0 is out the door
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@605972 13f79535-47bb-0310-9956-ffa450edef68
2007-12-20 16:23:16 +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
Guillaume Nodet ca4c58b564 Camel should be optional
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@598942 13f79535-47bb-0310-9956-ffa450edef68
2007-11-28 10:26:00 +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
Robert Davies 8931aac98e no need to call force() on commit as the reference store gets rebuilt on failure
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@585109 13f79535-47bb-0310-9956-ffa450edef68
2007-10-16 10:53:51 +00:00
Robert Davies cb234b32d3 change number of messages -was hanging waiting space
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@585047 13f79535-47bb-0310-9956-ffa450edef68
2007-10-16 05:46:18 +00:00
Robert Davies fe9bd4f594 fix for npe
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@584929 13f79535-47bb-0310-9956-ffa450edef68
2007-10-15 21:36:37 +00:00
Robert Davies 1722001748 fix data logs not being correctly removed
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@584863 13f79535-47bb-0310-9956-ffa450edef68
2007-10-15 19:31:22 +00:00
Hiram R. Chirino 487e694152 Fix for a failover transport deadlock that could occur if the transport is stopped at the same time a failure occurs.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@584800 13f79535-47bb-0310-9956-ffa450edef68
2007-10-15 14:50:09 +00:00
Robert Davies 67e5952dd1 Applied patch associated with:
https://issues.apache.org/activemq/browse/AMQ-358

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@584047 13f79535-47bb-0310-9956-ffa450edef68
2007-10-12 05:27:03 +00:00
Robert Davies cdf35dfe12 Expose properties for configuring the asyncDataManager
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@583949 13f79535-47bb-0310-9956-ffa450edef68
2007-10-11 20:58:25 +00:00
Robert Davies a9119eca19 Fix for NPE in duplex network connection
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@583595 13f79535-47bb-0310-9956-ffa450edef68
2007-10-10 19:53:07 +00:00
Robert Davies 5ac6f3a890 removed System.out
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@583571 13f79535-47bb-0310-9956-ffa450edef68
2007-10-10 18:28:53 +00:00
Robert Davies b2f7ba79db add some more useful methods
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@583237 13f79535-47bb-0310-9956-ffa450edef68
2007-10-09 17:45:54 +00:00
James Strachan 5dcf9cf6b9 added a plugin to support invocation of MessageListener classes as a bean in Camel; for more information see: http://cwiki.apache.org/CAMEL/activemq.html
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@583185 13f79535-47bb-0310-9956-ffa450edef68
2007-10-09 14:44:50 +00:00
James Strachan 810375af5f added a plugin to support invocation of MessageListener classes as a bean in Camel; for more information see: http://cwiki.apache.org/CAMEL/activemq.html
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@583184 13f79535-47bb-0310-9956-ffa450edef68
2007-10-09 14:44:20 +00:00
James Strachan 48e8c053fc updated javadoc link
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@583163 13f79535-47bb-0310-9956-ffa450edef68
2007-10-09 13:35:57 +00:00
James Strachan 27a6c0a301 updated the javadoc to be more clear about the camel support
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@583114 13f79535-47bb-0310-9956-ffa450edef68
2007-10-09 11:28:38 +00:00
Robert Davies b9d0972596 quick fix for npe
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@582910 13f79535-47bb-0310-9956-ffa450edef68
2007-10-08 17:47:47 +00:00
Robert Davies 22fbb80daf make persistentIndex true by default
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@582839 13f79535-47bb-0310-9956-ffa450edef68
2007-10-08 15:10:19 +00:00
Robert Davies edb50cb4de set options on the discovery agent correctly from the URI
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@582810 13f79535-47bb-0310-9956-ffa450edef68
2007-10-08 12:54:35 +00:00
Robert Davies d1eb18af70 Add properties to the AMQPersistenceAdaptorFactory
to set syncOnWrite(default=false) and persistentIndex(default=true) properties

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@582801 13f79535-47bb-0310-9956-ffa450edef68
2007-10-08 12:39:48 +00:00
Robert Davies 1d487896b4 refresh entry for prev as well as next
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@582575 13f79535-47bb-0310-9956-ffa450edef68
2007-10-07 05:10:28 +00:00
Robert Davies 84a116d2c7 Fix for https://issues.apache.org/activemq/browse/AMQ-1445
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@582574 13f79535-47bb-0310-9956-ffa450edef68
2007-10-07 04:42:24 +00:00
Robert Davies e2ef8b8165 patch http://issues.apache.org/activemq/browse/AMQ-1444
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@582086 13f79535-47bb-0310-9956-ffa450edef68
2007-10-05 06:02:46 +00:00
Robert Davies f3d633c2a9 Test case for sending single messages per connection - was blowing memory - now fixed
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@581885 13f79535-47bb-0310-9956-ffa450edef68
2007-10-04 13:01:25 +00:00
Robert Davies 805a0cc506 the MESSAGE_SIZE_OVERHEAD was too low - increased it to a more realistic size
Please note - this is related to the overhead in broker memory - not 
the on-the-wire size - which is small

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@581882 13f79535-47bb-0310-9956-ffa450edef68
2007-10-04 12:49:37 +00:00
Robert Davies 5f8c101973 By default, use no subscription recovery policy for temporary or advisory topics
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@581881 13f79535-47bb-0310-9956-ffa450edef68
2007-10-04 12:48:02 +00:00
Robert Davies fc69b29343 handle errors from recovery check gracefully
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@581792 13f79535-47bb-0310-9956-ffa450edef68
2007-10-04 08:00:39 +00:00
Robert Davies 3c1a8474f9 FilePendingMessageCursor was being added twice to the MemoryUsage
which resulted in a memory leak

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@581784 13f79535-47bb-0310-9956-ffa450edef68
2007-10-04 06:18:49 +00:00
Hiram R. Chirino c256dcf9e8 Fix for https://issues.apache.org/activemq/browse/AMQ-1038
We now send REDELIVERY acks to the broker when a message is redelivered.  This allows the broker to update the message with the number of times redelivery has occured so that if the message is delivered to another consumer it can DQL the message when max redeliveries have occured across consumers.



git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@581747 13f79535-47bb-0310-9956-ffa450edef68
2007-10-03 23:32:29 +00:00
Robert Davies 1401e69956 after canceling a TimerTask - purge from the Timer list - fix memory leak
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@581736 13f79535-47bb-0310-9956-ffa450edef68
2007-10-03 21:55:40 +00:00
Robert Davies 7b1fd3484e Fix for http://issues.apache.org/activemq/browse/AMQ-1250
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@581715 13f79535-47bb-0310-9956-ffa450edef68
2007-10-03 20:24:27 +00:00
Robert Davies 08841bbde3 fix memory leak in ActiveMQConnection - with asyncConnectionThread not being shutdown on a close
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@581683 13f79535-47bb-0310-9956-ffa450edef68
2007-10-03 18:50:03 +00:00
Robert Davies 5bd3bf6e24 Ignore NULL references when checking isEmpty
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@581568 13f79535-47bb-0310-9956-ffa450edef68
2007-10-03 11:24:38 +00:00
Robert Davies 69a5e00843 be conservative allocating objects up-front
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@581321 13f79535-47bb-0310-9956-ffa450edef68
2007-10-02 17:58:11 +00:00
Robert Davies 595d95b3da Have the TransactionContext per connection
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@581242 13f79535-47bb-0310-9956-ffa450edef68
2007-10-02 13:58:22 +00:00
Robert Davies 6aa4bcad5b some unnecessary memory allocations removed
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@581167 13f79535-47bb-0310-9956-ffa450edef68
2007-10-02 09:25:39 +00:00
Hiram R. Chirino 53c4e125f6 Fix for AMQ-1095:
- Added contributed test cases
 - We now filter out non-matching messages as they are loaded into the TopicStorePrefetch
 - Changed the TopicStorePrefetch and StoreDurableSubscriberCursor so that they don't depend
   on the pending message counter since some stores cannot give an accurate count for it.



git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@581053 13f79535-47bb-0310-9956-ffa450edef68
2007-10-01 20:02:18 +00:00
Hiram R. Chirino 7bd8fb6754 Fix failing test cases.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@580475 13f79535-47bb-0310-9956-ffa450edef68
2007-09-28 20:16:08 +00:00
Hiram R. Chirino 3d024d6b4f Make amq 5.x compatible again with 4.x clients
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@580382 13f79535-47bb-0310-9956-ffa450edef68
2007-09-28 15:09:33 +00:00
Robert Davies 19a83ae3cb Rolled back patches for https://issues.apache.org/activemq/browse/AMQ-1361 - as no licence headers where provided - we can't accept
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@580273 13f79535-47bb-0310-9956-ffa450edef68
2007-09-28 09:46:50 +00:00
Hiram R. Chirino e21587fb9e Added the ASL to a bunch of property files.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@580013 13f79535-47bb-0310-9956-ffa450edef68
2007-09-27 13:35:43 +00:00
James Strachan 42b768aa1f added patch for https://issues.apache.org/activemq/browse/AMQ-1435 to handle Mirrored Queues (so that folks can consume on a topic what messages are sent to a queue)
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@579941 13f79535-47bb-0310-9956-ffa450edef68
2007-09-27 08:26:57 +00:00
James Strachan 8cad176f68 minor change to make tests more exclusive to avoid 'em hitting each other
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@579639 13f79535-47bb-0310-9956-ffa450edef68
2007-09-26 12:30:45 +00:00
James Strachan d48322690f added patch for AMQ-1434 to allow transport listeners to be used with a connection factory for easy integration with Spring JmsTemplate etc
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@579498 13f79535-47bb-0310-9956-ffa450edef68
2007-09-26 08:08:14 +00:00
Robert Davies 2b063efafa fix reference counting
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@578877 13f79535-47bb-0310-9956-ffa450edef68
2007-09-24 17:00:08 +00:00
Hiram R. Chirino 01bdc524e7 Better broker shutdown handling and also better test support.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@577882 13f79535-47bb-0310-9956-ffa450edef68
2007-09-20 19:11:44 +00:00
Hiram R. Chirino b7b929d90f Removing invalid testcase. This test was setting up 2 consumers and storing the message sequences in a single list for both. Further more it was checking that those messages were delivered in order. It is not possible garantee order between 2 consumers.. therefore this test is invalid.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@577881 13f79535-47bb-0310-9956-ffa450edef68
2007-09-20 19:09:44 +00:00
Hiram R. Chirino c8666f89dc Fix for broken test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@577878 13f79535-47bb-0310-9956-ffa450edef68
2007-09-20 18:57:38 +00:00
Hiram R. Chirino 54d24ad3bf Fix broke test.. A transaction manager is now required when transacted endpoints are configured.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@577869 13f79535-47bb-0310-9956-ffa450edef68
2007-09-20 18:49:01 +00:00
Guillaume Nodet 8032375531 AMQ-1429: Package ActiveMQ as OSGi bundles instead of plain jars
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@577760 13f79535-47bb-0310-9956-ffa450edef68
2007-09-20 14:16:12 +00:00
Hiram R. Chirino 00895cecc1 ActiveMQ is out of the incubator.. no need for DISCLAIMER.txt anymore
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@577759 13f79535-47bb-0310-9956-ffa450edef68
2007-09-20 14:13:23 +00:00
Robert Davies 4d01443fa7 make the locking more coarse grained
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@577746 13f79535-47bb-0310-9956-ffa450edef68
2007-09-20 13:49:32 +00:00
Robert Davies 417fcd7f19 Don't use System.out
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@577683 13f79535-47bb-0310-9956-ffa450edef68
2007-09-20 11:09:32 +00:00
Robert Davies 6b7055afc8 remove unused imports
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@576527 13f79535-47bb-0310-9956-ffa450edef68
2007-09-17 17:06:14 +00:00
Robert Davies a98333a19a use default amq persistence
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@574646 13f79535-47bb-0310-9956-ffa450edef68
2007-09-11 17:38:56 +00:00
James Strachan 696b34a01d use the same ConnectionFactory so that transactional consume + send can use the same session
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@574465 13f79535-47bb-0310-9956-ffa450edef68
2007-09-11 05:47:30 +00:00
James Strachan 5829d7045c added better debug logging
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@574460 13f79535-47bb-0310-9956-ffa450edef68
2007-09-11 05:20:20 +00:00
Hiram R. Chirino 84da202a7a Update to the latest version of xbean
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@574327 13f79535-47bb-0310-9956-ffa450edef68
2007-09-10 18:41:32 +00:00
Hiram R. Chirino a69c3e78c5 Switch to using a Timer to schedual tasks. Seems to have much more acurate time delays between executions.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@574321 13f79535-47bb-0310-9956-ffa450edef68
2007-09-10 18:27:40 +00:00
Hiram R. Chirino 5f96839259 Moved the camel-activemq module into the activemq-core module to break the circular dependency between the activemq and camel projects.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@573615 13f79535-47bb-0310-9956-ffa450edef68
2007-09-07 15:44:45 +00:00
Hiram R. Chirino b732d3d114 Fix for the QueueWorkerPrefetchTest. The VMPendingMessageCursor.isEmpty() was returning true when it had an a message that had been marked dropped due to it being delivered by another subscription.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@573400 13f79535-47bb-0310-9956-ffa450edef68
2007-09-06 22:19:25 +00:00
Hiram R. Chirino 222daf2323 Fix for https://issues.apache.org/activemq/browse/AMQ-1382... if the broker.persistent==false then we should not create any files, not even for the Temp Store.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@573397 13f79535-47bb-0310-9956-ffa450edef68
2007-09-06 22:14:34 +00:00
Hiram R. Chirino b81dd2886e Fixed ContainerId so that it also uses the container name when it compares equality. Switch back to using a single index file
for the topic susbcriptions lists.



git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@573395 13f79535-47bb-0310-9956-ffa450edef68
2007-09-06 22:11:43 +00:00
Hiram R. Chirino 838e9a42b4 if the container name has '/' in it then make sure we create the parent directories before we try to access the file.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@573392 13f79535-47bb-0310-9956-ffa450edef68
2007-09-06 22:05:43 +00:00
Hiram R. Chirino 1301501a0a Fixed synchronizations so that threads don't block each others processing as much and now the test works fine without hanging. see https://issues.apache.org/activemq/browse/AMQ-1251
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@573342 13f79535-47bb-0310-9956-ffa450edef68
2007-09-06 19:25:46 +00:00
Hiram R. Chirino 642d38cd8c Fix for https://issues.apache.org/activemq/browse/AMQ-1156
We now actually update the tcpNoDelay setting on the socket once the wireformat options are negociated.  This allows
the client to control if his socket and the server's socket use the option.  By default tcpNoDelay is enabled.
the client should use a URL like -Durl=tcp://localhost:61616?wireFormat.tcpNoDelayEnabled=false to disable tcpNoDelay on both the client and the server socket.



git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@573080 13f79535-47bb-0310-9956-ffa450edef68
2007-09-05 21:51:40 +00:00
Hiram R. Chirino 9e61ade946 Fixing compile issue cause by camel API change
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@573005 13f79535-47bb-0310-9956-ffa450edef68
2007-09-05 17:18:54 +00:00
Robert Davies 65454017fc Ensure system safe names are used for container names
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@572975 13f79535-47bb-0310-9956-ffa450edef68
2007-09-05 15:47:20 +00:00
Robert Davies 0d0dd4587d use potentially shorter container name for the topic subscriber references
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@572974 13f79535-47bb-0310-9956-ffa450edef68
2007-09-05 15:41:19 +00:00
Robert Davies ec2cfc5fd0 shorten the name of the container containing the SubscriberMessageList
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@572905 13f79535-47bb-0310-9956-ffa450edef68
2007-09-05 09:06:32 +00:00
Robert Davies 1195ae751c ensure the ConectionContext always has a broker set before sending message to DLQ
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@572300 13f79535-47bb-0310-9956-ffa450edef68
2007-09-03 12:50:17 +00:00
Hiram R. Chirino 0a52fe7289 Satitized the filenames that the KahaStore uses.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@571306 13f79535-47bb-0310-9956-ffa450edef68
2007-08-30 20:49:41 +00:00
Robert Davies eba0ae3c7b test case for https://issues.apache.org/activemq/browse/AMQ-1251
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@571150 13f79535-47bb-0310-9956-ffa450edef68
2007-08-30 12:54:06 +00:00
Robert Davies 3cd1e6c73f ensure exception is logged if one is raised sending a message to a dead letter queue
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@569270 13f79535-47bb-0310-9956-ffa450edef68
2007-08-24 06:29:18 +00:00
Jonas B. Lim d97054b1c2 fix for https://issues.apache.org/activemq/browse/AMQ-1365
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@568869 13f79535-47bb-0310-9956-ffa450edef68
2007-08-23 07:48:37 +00:00
James Strachan fba074227d allow a MessageListener to be specified when creating a consumer; to avoid threading issues when creating lots of consumers after the connection has started
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@568644 13f79535-47bb-0310-9956-ffa450edef68
2007-08-22 15:09:44 +00:00
Hiram R. Chirino 2b0024c269 Made the SystemUsage and associated *Usage classes IOC friendly so that they can be configured
via xbean/spring.  Fixed the ConfigTest test case.



git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@567796 13f79535-47bb-0310-9956-ffa450edef68
2007-08-20 19:30:33 +00:00
Robert Davies 6d8e2c5b3a UpdateManager changed to account for Store and Temp data usage as well as memory usage
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@567647 13f79535-47bb-0310-9956-ffa450edef68
2007-08-20 10:37:29 +00:00
Hiram R. Chirino 90deed42cc Improved the STOMP test case a little to verify that killed stomp clients redeliver un acked messages
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@566277 13f79535-47bb-0310-9956-ffa450edef68
2007-08-15 17:33:05 +00:00
Hiram R. Chirino 926f9ce614 Control file was not properly loading state when the the record length stored was not == to the max record length.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@566202 13f79535-47bb-0310-9956-ffa450edef68
2007-08-15 14:46:03 +00:00
James Strachan 232844d462 Removing unwanted test files from the test-jar
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@566121 13f79535-47bb-0310-9956-ffa450edef68
2007-08-15 12:34:24 +00:00
Robert Davies 54c8eeb842 temporarily comment out log4j dependency
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@565632 13f79535-47bb-0310-9956-ffa450edef68
2007-08-14 06:07:37 +00:00
Robert Davies df6b54240c Applied patch from http://issues.apache.org/activemq/browse/AMQ-1361
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@565381 13f79535-47bb-0310-9956-ffa450edef68
2007-08-13 15:44:44 +00:00
Hiram R. Chirino 5f1adbe898 More checkstyle fixes
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@564977 13f79535-47bb-0310-9956-ffa450edef68
2007-08-11 21:29:21 +00:00
Hiram R. Chirino 933eb2f9e4 More checkstyle fixes and Generics usage.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@564814 13f79535-47bb-0310-9956-ffa450edef68
2007-08-11 00:49:19 +00:00
Hiram R. Chirino 5719351cb7 Fix for the testQueuePersistentUncommitedAcksLostOnRestart() test in RecoveryBrokerTest. Since this test resuses the memory based store instance across restarts, the cusror pointers were not getting reset after restart.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@564685 13f79535-47bb-0310-9956-ffa450edef68
2007-08-10 17:18:14 +00:00
Hiram R. Chirino ecf89a60bf More checkstyle violation fixes
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@564679 13f79535-47bb-0310-9956-ffa450edef68
2007-08-10 16:57:01 +00:00
Jonas B. Lim 1963ea4006 added test case to simulate "javax.jms.JMSException: Transaction 'TX:ID:...' has not been started." exception
this test appears to manifest consistently on a MacBook. Haven't been able to reproduce this on windows though. 
Is excluded by default as the test can sometime take too long to execute

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@564505 13f79535-47bb-0310-9956-ffa450edef68
2007-08-10 08:22:09 +00:00
Hiram R. Chirino fc00993839 More checkstyle violation fixes
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@564271 13f79535-47bb-0310-9956-ffa450edef68
2007-08-09 16:37:49 +00:00
Hiram R. Chirino 74a7a8bbfc More checkstyle fixes
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@564057 13f79535-47bb-0310-9956-ffa450edef68
2007-08-09 00:34:07 +00:00
Hiram R. Chirino f812e34179 More checkstyle fixes
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@563982 13f79535-47bb-0310-9956-ffa450edef68
2007-08-08 18:56:59 +00:00
Hiram R. Chirino 43ba1be188 Fixing checkstyle issues
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@563930 13f79535-47bb-0310-9956-ffa450edef68
2007-08-08 16:30:17 +00:00
Hiram R. Chirino 230a86c489 Fixing a bunch of checkstyle violations
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@563921 13f79535-47bb-0310-9956-ffa450edef68
2007-08-08 15:52:25 +00:00
Hiram R. Chirino 0945e32b6a Fix the TopicMasterSlaveTest that was failing
- Stack was overflowing due to the advisory broker advising on topic advisories
 - MasterConnector now makes sync request to the slave if it's given a sync request
 - Test was failing due to kaha not being able to create a file that was too long.. fixed by making the 
   sub name and client id and dest name shorter.  Need to revisit.



git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@563854 13f79535-47bb-0310-9956-ffa450edef68
2007-08-08 13:22:15 +00:00
James Strachan 4102accade migrated the Camel destination code from the camel project into ActiveMQ as it makes more sense to host it here - and avoids a circular dependency issue when releasing ActiveMQ 5.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@563609 13f79535-47bb-0310-9956-ffa450edef68
2007-08-07 18:36:58 +00:00
Hiram R. Chirino 2728ccbb88 Fix for AMQ-1356 : Durable Subscriptions do not work with Wildcards after broker is restarted.
- Added a RecoveryBrokerTest.testWildCardSubscriptionPreservedOnRestart() test case that was showing
   that that wildcards did not work with DurableSubscriptions
 - Fix the TransactedTopicMasterSlaveTest so that setDeleteAllMessagesOnStartup() takes effect (had to be done before the connectors are added.
 - Change the MessageStore interface so that subscriptions are created using the data in the SubscriptionInfo class
 - Added a subscribedDestination field to the SubscriptionInfo so that the original wildcard subscrption can be remembered
 - The KahaReference store now deletes it's State store too when deleteAllMessages() is called
 - Fixed KahaPersistenceAdapter.getDestinations() so that it actually returns all the destinations.
 - We now recover all the topics eagerly when the topic region is started.



git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@563194 13f79535-47bb-0310-9956-ffa450edef68
2007-08-06 17:07:55 +00:00
Hiram R. Chirino 8b68c62249 Switched from using ${activemq-version} to using ${version}
added a required dependency in activemq-web to spring-web


git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@562099 13f79535-47bb-0310-9956-ffa450edef68
2007-08-02 13:03:33 +00:00
Robert Davies 64b8fb64f4 Added explicit error for badly formated broker name
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@561815 13f79535-47bb-0310-9956-ffa450edef68
2007-08-01 14:49:48 +00:00
Robert Davies ec6a7029c5 updated message properties
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@561428 13f79535-47bb-0310-9956-ffa450edef68
2007-07-31 18:34:32 +00:00
Hiram R. Chirino 5ad4732038 - Faster VMTransport shutdown by avoiding a potential deadlock
- Better connection shutdown.


git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@561180 13f79535-47bb-0310-9956-ffa450edef68
2007-07-30 23:11:24 +00:00
Hiram R. Chirino f90c62c640 Fix for intermitent test failure at:
testOneProducerManyConsumersManyMessages(org.apache.activemq.broker.policy.RoundRobinDispatchPolicyTest)
It was checking that messages were evenly distributed accross consumers but that can only be garanteed when 
the consumer prefetches can hold all the published messages.



git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@561113 13f79535-47bb-0310-9956-ffa450edef68
2007-07-30 20:50:01 +00:00
Robert Davies 350a2aad7f Fix for https://issues.apache.org/activemq/browse/AMQ-1305
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@561109 13f79535-47bb-0310-9956-ffa450edef68
2007-07-30 20:36:16 +00:00
Robert Davies c07b23352c Fix for https://issues.apache.org/activemq/browse/AMQ-567
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@561088 13f79535-47bb-0310-9956-ffa450edef68
2007-07-30 18:45:49 +00:00
Robert Davies b3eb9a5e5b added support for properties brokerInTime and brokerOutTime
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@561028 13f79535-47bb-0310-9956-ffa450edef68
2007-07-30 16:07:17 +00:00
Robert Davies a401575569 Added support for length of time messages are processed by the broker -
fix for https://issues.apache.org/activemq/browse/AMQ-1160,
https://issues.apache.org/activemq/browse/AMQ-1072,
https://issues.apache.org/activemq/browse/AMQ-936 
and ground work for for https://issues.apache.org/activemq/browse/AMQ-567

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@561026 13f79535-47bb-0310-9956-ffa450edef68
2007-07-30 16:01:37 +00:00
Hiram R. Chirino b97f7d8479 Fixed pom so that it generates the openwire commands when mvn clean compile -P openwire-generate
is run

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@560989 13f79535-47bb-0310-9956-ffa450edef68
2007-07-30 14:10:04 +00:00
Hiram R. Chirino 2d27d56e59 - Fix for the xmpp transport needed du to recently added stop() synchronization.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@560979 13f79535-47bb-0310-9956-ffa450edef68
2007-07-30 13:41:59 +00:00
Hiram R. Chirino ea74731701 Serveral changes needed to Fix https://issues.apache.org/activemq/browse/AMQ-1349
- The vm:// transport was delivering events to the listener before start() was called.  Also clean it up a little by consolidating
   the use of the prePeerSetQueue and messageQueue field.
 - the tcp:// .stop() method now blocks until the thread that calls out to the listener is shutdown.
 - TransportConnection was not doing a good job synchronizing when multiple concurrent conenctions to the same connection Id was established.
   IllegalStateExceptions were common when a failover connection reconnected.  Now we make sure that only 1 connection with a given connectionId
   is activley operating in the broker.  Also removed 1 un-needed hash lookup by replacing the brokerConnectionStates Map with the 
   connectionState variable.
    
Also added a pause in the JmsTempDestinationTest to avoid intermitent failures.



git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@560872 13f79535-47bb-0310-9956-ffa450edef68
2007-07-30 05:34:37 +00:00
Robert Davies 3a5f48d277 Fix for http://issues.apache.org/activemq/browse/AMQ-1080
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@560783 13f79535-47bb-0310-9956-ffa450edef68
2007-07-29 19:01:29 +00:00
Robert Davies eeb8d5bafc remove println
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@560700 13f79535-47bb-0310-9956-ffa450edef68
2007-07-29 08:59:46 +00:00
Robert Davies 13729a3690 Enabled
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@560699 13f79535-47bb-0310-9956-ffa450edef68
2007-07-29 08:59:30 +00:00
Robert Davies 6013b64f97 updated for junit test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@560698 13f79535-47bb-0310-9956-ffa450edef68
2007-07-29 08:58:59 +00:00
Robert Davies 35ba427ec9 Fix for http://issues.apache.org/activemq/browse/AMQ-920
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@560696 13f79535-47bb-0310-9956-ffa450edef68
2007-07-29 08:57:31 +00:00
Robert Davies 50c6d9ccc8 A message is a message isMessage()
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@560695 13f79535-47bb-0310-9956-ffa450edef68
2007-07-29 08:56:54 +00:00
Robert Davies 14180c5cb3 check for nulls
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@560694 13f79535-47bb-0310-9956-ffa450edef68
2007-07-29 08:56:21 +00:00
Robert Davies 1e3e5b7223 Fix for http://issues.apache.org/activemq/browse/AMQ-1294
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@560693 13f79535-47bb-0310-9956-ffa450edef68
2007-07-29 08:54:49 +00:00
Hiram R. Chirino 3b73e60233 Fix for http://issues.apache.org/activemq/browse/AMQ-1348
Better file locking on windows.  We now use a seperate lock file to signifiy the lock on the kaha db.



git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@560352 13f79535-47bb-0310-9956-ffa450edef68
2007-07-27 18:49:47 +00:00
Hiram R. Chirino 9d2e5418fe Added a handy processingDelay option to the MessageIdList so that a test case and simulate a slow consumer
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@560294 13f79535-47bb-0310-9956-ffa450edef68
2007-07-27 16:02:04 +00:00