Commit Graph

4272 Commits

Author SHA1 Message Date
Claus Ibsen 0e724cd53f AMQ-4010: Use pre compiled pattern when doing string replaceAll as its faster.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1379761 13f79535-47bb-0310-9956-ffa450edef68
2012-09-01 13:04:53 +00:00
Claus Ibsen 3092051699 AMQ-4008: Fixed issue with re-deploying AMQ broker in same JVM such as Apache Tomcat, with the jmx connector not working on re-deployment. Now it does. Improved logging and better message to end user about the JMX issue.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1379454 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 14:01:39 +00:00
Claus Ibsen eea9fca04d AMQ-4008: Fixed MDC leak during shutting down AMQ broker, such as reported by Apache Tomcat.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1379376 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 09:10:23 +00:00
Bosanac Dejan f5178cc73f https://issues.apache.org/jira/browse/AMQ-4005 - pluggable lockers; move shared file locker from kahadb package and improve javadocs
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378917 13f79535-47bb-0310-9956-ffa450edef68
2012-08-30 13:00:04 +00:00
Claus Ibsen b080d5fe21 AMQ-3988: Setting a message listener to null on AcitveMQSession should be allowed even if the session has been closed, to avoid throwning invalid state exception, that causes exceptions to be logged during shutting down apps. This allows a more clean shutdown of AMQ.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378887 13f79535-47bb-0310-9956-ffa450edef68
2012-08-30 11:15:32 +00:00
Bosanac Dejan 6ce702d4cf https://issues.apache.org/jira/browse/AMQ-4005 - plugable lockers; introduce new API and refactor current KahaDB and JDBC solutions
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378881 13f79535-47bb-0310-9956-ffa450edef68
2012-08-30 10:47:49 +00:00
Timothy A. Bish 324ab99afa additional change for: https://issues.apache.org/jira/browse/AMQ-3996
The sslEngine instance in the NIOSSLTransport needs to be updated when the handshake process completes.



git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378686 13f79535-47bb-0310-9956-ffa450edef68
2012-08-29 19:11:22 +00:00
Gary Tully 99be769f96 https://issues.apache.org/jira/browse/AMQ-3998 https://issues.apache.org/jira/browse/AMQ-3999 - fix regression in org.apache.activemq.bugs.AMQ3934Test - resetting batch too eagerly in old behaviour results in picking up deleted message
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378542 13f79535-47bb-0310-9956-ffa450edef68
2012-08-29 13:30:04 +00:00
Gary Tully 935265529f make test more deterministic, ensure bridge starts first time b/c remote broker is started first, may need to use a queue if there are further inconsistency problems
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378540 13f79535-47bb-0310-9956-ffa450edef68
2012-08-29 13:29:20 +00:00
Timothy A. Bish 6175dc4639 fix for: https://issues.apache.org/jira/browse/AMQ-3996
Set the transportContext property if the certificates are available.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378372 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 22:41:02 +00:00
Torsten Mielke d3ce3d8e4a Enabling support for JMX (off by default) to NetworkTestSupport
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378102 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 12:21:35 +00:00
Gary Tully d41f40a051 https://issues.apache.org/jira/browse/AMQ-3998 https://issues.apache.org/jira/browse/AMQ-3999 - fix issue with redispatch of committed prepared transactions, unnecessary call to determin store size for durable subs and duplicate recording of message pending dispatch on an unsubscribe
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1378085 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 11:42:27 +00:00
Timothy A. Bish 53f07b0a75 fix for: https://issues.apache.org/jira/browse/AMQ-3995
Remove the long and not so useful serial add test.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1377779 13f79535-47bb-0310-9956-ffa450edef68
2012-08-27 18:26:22 +00:00
Timothy A. Bish 6ce59ed1b0 fix and test for: https://issues.apache.org/jira/browse/AMQ-3992
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1377095 13f79535-47bb-0310-9956-ffa450edef68
2012-08-24 20:39:23 +00:00
Gary Tully c55f6a84d7 https://issues.apache.org/jira/browse/AMQ-3557 - Performance of consumption with JDBC persistance and Microsoft SQL Server. Fix up default value for maxRows to allign with default page size. Use a large maxPageSize via destination policy for durable subs that have sparse selectors. Same as queues with sparse selectors
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1376934 13f79535-47bb-0310-9956-ffa450edef68
2012-08-24 14:21:22 +00:00
Gary Tully 705a877981 trace temp dest recreation by state tracker
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1376513 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 14:45:17 +00:00
Gary Tully 5ed1ce50da https://issues.apache.org/jira/browse/AMQ-3872 - fix up typo in blob adapter
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1376100 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 15:29:28 +00:00
Gary Tully 6c73104152 include local port in transport to string to allow correlation between client and server side transport threads based on their ports.
Appending @local-port so client side: "ActiveMQ Transport: tcp://localhost/127.0.0.1:61616@56811" thread can be correlated with broker
side: "ActiveMQ Transport: tcp:///127.0.0.1:56811@61616" which listens on local 61616

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1376038 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 13:31:20 +00:00
Timothy A. Bish 4bace216b9 updated fix: https://issues.apache.org/jira/browse/AMQ-3982
Instead of locking on the PList iterator which forces a lock on every access to hasNext we should lock down at the PageFile level in readPage making the seek and read an atomic operation.  Since many reads on a single already loaded page don't need to be synchronized we pay a higher price for locking in the specific PList case than we do buy creating this atomic read operation in PageFile. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1375852 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 23:28:50 +00:00
Gary Tully ba9037ca65 https://issues.apache.org/jira/browse/AMQ-3985 - ActiveMQConnection temp advisory consumer should use asyncDispatch - can cause deadlock with slow consumers. Fix with test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1375595 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 14:59:41 +00:00
Bosanac Dejan dfbdbf6a50 https://issues.apache.org/jira/browse/AMQ-3983 - osgi dependency
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1375543 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 13:44:49 +00:00
Gary Tully a526a60abd avoid repated additions to the full list on dispatch, may need to revisit the pendingWakeups count on iterate, seems we will attempt to dispatch too often which is a waste of cpu in the event that there are pending messages or new sends and slow consumers, relates to: https://issues.apache.org/jira/browse/AMQ-1902
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1375484 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 11:54:31 +00:00
Gary Tully 3fa927554c https://issues.apache.org/jira/browse/AMQ-3887 - have local dispatch do safe wait till remove broker setup is complete such that producer is fully created
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1375459 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 10:26:24 +00:00
Gary Tully 7e206615b8 remove non portable ref to /tmp for test - https://issues.apache.org/jira/browse/AMQ-3982
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1375444 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 09:29:33 +00:00
Timothy A. Bish 030d09b816 fix and test for: https://issues.apache.org/jira/browse/AMQ-3982
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1375140 13f79535-47bb-0310-9956-ffa450edef68
2012-08-20 17:50:10 +00:00
Timothy A. Bish e49f5d9ff8 fix for: https://issues.apache.org/jira/browse/AMQ-3981
Remove the commons log reference and unused logger. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1374231 13f79535-47bb-0310-9956-ffa450edef68
2012-08-17 12:55:35 +00:00
Timothy A. Bish 3c39db8cce fix and test for: https://issues.apache.org/jira/browse/AMQ-3961
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1374229 13f79535-47bb-0310-9956-ffa450edef68
2012-08-17 12:47:37 +00:00
Bosanac Dejan a60442458e https://issues.apache.org/jira/browse/AMQ-3973 - data.db not calculated in store size
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1372859 13f79535-47bb-0310-9956-ffa450edef68
2012-08-14 12:35:26 +00:00
Bosanac Dejan ce50e287ac https://issues.apache.org/jira/browse/AMQ-3972 - failover transport - don't propagate exceptions for disposed transport
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1372770 13f79535-47bb-0310-9956-ffa450edef68
2012-08-14 08:34:41 +00:00
Bosanac Dejan 38e5c0829a https://issues.apache.org/jira/browse/AMQ-3885 + https://issues.apache.org/jira/browse/AMQ-3971 - removing System.out.println()
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1372754 13f79535-47bb-0310-9956-ffa450edef68
2012-08-14 07:38:27 +00:00
Timothy A. Bish 60832c0b2d change m2e connector config
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1371814 13f79535-47bb-0310-9956-ffa450edef68
2012-08-10 19:48:43 +00:00
Timothy A. Bish 60383038d3 Test didn't need to depend on hard coded port so use :0 instead. Add some additional test cases.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1371809 13f79535-47bb-0310-9956-ffa450edef68
2012-08-10 19:01:24 +00:00
Torsten Mielke 39e20d0415 AMQ-3965: Fix for org.apache.activemq.ActiveMQMessageConsumer.java plus new JUnit test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1371722 13f79535-47bb-0310-9956-ffa450edef68
2012-08-10 14:44:36 +00:00
Bosanac Dejan fc0b359973 stop brokers after test, which should prevent DbRestartJDBCQueueMasterSlaveLeaseQuiesceTest.testVirtualTopicFailover from failing
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1371706 13f79535-47bb-0310-9956-ffa450edef68
2012-08-10 14:04:58 +00:00
Timothy A. Bish e28b55c142 Don't exit the broker stop loop if you get an exception, log it and stop the rest if possible.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1371200 13f79535-47bb-0310-9956-ffa450edef68
2012-08-09 13:24:33 +00:00
Timothy A. Bish 0a676e5ffb Add a shorter connectTimeout to ensure the tests don't fail because they are waiting on the reconnectMutex for to long.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1370865 13f79535-47bb-0310-9956-ffa450edef68
2012-08-08 18:01:11 +00:00
Timothy A. Bish ca15308b3f method buildBackups should bail out early in the transport is stopped.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1370581 13f79535-47bb-0310-9956-ffa450edef68
2012-08-07 22:50:26 +00:00
Timothy A. Bish b6e82fec92 Test can leave a dangling BrokerSerive instance running if it get an assertion at the right time. Make sure all started brokers get stopped.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1370576 13f79535-47bb-0310-9956-ffa450edef68
2012-08-07 22:28:26 +00:00
Timothy A. Bish 205d02598d Refine the fix for: https://issues.apache.org/jira/browse/AMQ-3939
The unit test was failing on slower hardware, some backups could be missed if the transport was processing the ConnectionControl command during the stop since the buildBackups method runs from there outside the reconnectMutex and not in the thread of the taskRunner. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1370559 13f79535-47bb-0310-9956-ffa450edef68
2012-08-07 22:02:28 +00:00
Gary Tully 378d7a606b https://issues.apache.org/jira/browse/AMQ-3958 - fix up for current and next few versions, highlight in the release guide
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1368861 13f79535-47bb-0310-9956-ffa450edef68
2012-08-03 10:01:44 +00:00
Timothy A. Bish 99f044574d Add to the test case to show there's no problem for: https://issues.apache.org/jira/browse/AMQ-3285
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1368034 13f79535-47bb-0310-9956-ffa450edef68
2012-08-01 14:46:18 +00:00
Gary Tully 8e60ca9a90 https://issues.apache.org/jira/browse/AMQ-3956 - KahaDB pagefile (db.data) steady growth - BTreeIndex page leak. release the clild page when empty branch is promoted, additional tests
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1367924 13f79535-47bb-0310-9956-ffa450edef68
2012-08-01 11:22:48 +00:00
Gary Tully 91ac82a83c add test that seems to show index growth with repeated use of durable subs
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1367626 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 15:53:29 +00:00
Timothy A. Bish 3eed779378 apply patch for: https://issues.apache.org/jira/browse/AMQ-3954
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1367622 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 15:50:36 +00:00
Timothy A. Bish 79bce92c33 apply patch for: https://issues.apache.org/jira/browse/AMQ-3953
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1367620 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 15:43:59 +00:00
Gary Tully c9b49d8b07 https://issues.apache.org/jira/browse/AMQ-3294 - further refinement of dispose on security exception, now only on connection attempts. A security exception on an authenticated connection is reported back to the client and remains intact. Made use of inactivitymonitor w useKeepAlive=false to abort dos style hogging connections
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1367553 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 13:54:41 +00:00
Gary Tully 78529d4eaf add some context to the intermittent failure, issue is ioexception from store being treated as transport failure, if the error ocurrs on a ack commit we can expect a redelivery that won't come and fail the test
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1367552 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 13:53:37 +00:00
Timothy A. Bish fefb228698 fix for: https://issues.apache.org/jira/browse/AMQ-3947
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1366202 13f79535-47bb-0310-9956-ffa450edef68
2012-07-26 21:07:01 +00:00
Timothy A. Bish 27a74d381b fix for: https://issues.apache.org/jira/browse/AMQ-3917
Allow multiple durable subs for Stomp v1.1 client connections.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1366173 13f79535-47bb-0310-9956-ffa450edef68
2012-07-26 19:43:41 +00:00
Hiram R. Chirino 633d5ea043 Move the slow tests to it's own profile.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1366013 13f79535-47bb-0310-9956-ffa450edef68
2012-07-26 14:19:44 +00:00