summaryrefslogtreecommitdiff
path: root/qpid/java
Commit message (Collapse)AuthorAgeFilesLines
* QPID-3864: add/fix licences in the Java tree for 0.16Robert Gemmell2012-04-1914-1/+256
| | | | | | | merged trunk r1327905 and r1327912, and also updated java/jca/.gitignore git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.16@1327923 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3911: Fix deadlock on concurrent invocation of MessageConsumer#close() ↵Robert Gemmell2012-04-113-21/+68
| | | | | | | | | | | | | | | | | | and Session#rollback() from consumer MessageListener This patch contains the following changes: - Add synchronization on AMSession#_messageDeliveryLock into MessageConsumer#close() in order to block until message listener in progress has completed(as required in JMS javadoc for MessageConsumer#close()). - Change the session dispatcher to stop messages delivery into consumer local message queue if the consumer in the process of closing. This eliminates the need to stop the dispatcher on rejecting pending messages for closing consumer. - Remove the synchronization on the dispatcher lock from AMQSession.Dispatcher#rejectPending and code to stop the dispatcher, as we are synchronizing on the deliveryLock now and incoming messages are not dispatched into closing consumers anymore. - Add a system test to reproduce the deadlock and verify its resolution. Applied patch from Oleksandr Rudyy <orudyy@gmail.com> merged from trunk r1310275 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.16@1324655 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3905: NullPointerException is thrown on rejecting messages whilst ↵Robert Gemmell2012-04-111-3/+3
| | | | | | | | | closing the connection merged from trunk r1304970 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.16@1324648 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: add mockito mocking framework, which is a dependency of the ↵Robert Gemmell2012-04-042-1/+2
| | | | | | | | | previous merged changes merged from trunk r1302874 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.16@1309390 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3927: add a systest which would highlight the underlying issue by ↵Robert Gemmell2012-04-041-0/+100
| | | | | | | | | failing to receive all messages present on the priority queue merged from trunk r1309155 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.16@1309388 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3927: ensure that priority is properly accounted for when comparing ↵Robert Gemmell2012-04-043-4/+165
| | | | | | | | | messages on different QueueEntryLists contained within the encompassing PriorityQueue merged from trunk r1309050 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.16@1309383 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3864: Update version strings to 0.16Justin Ross2012-03-0813-14/+14
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.16@1298344 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3888: ensure the SQEL iterator uses the getNextValidEntry() method to ↵Robert Gemmell2012-03-064-22/+69
| | | | | | advance, simplifying its implementation and aiding queue cleanup by releasing deleted entries from the data structure. In doing so ensure that it ignores a deleted node at the end of the list, returning that it is atTail and cannot advance. Add unit test highlighting the issue and confirming its resolution. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1297794 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3882: remove the unused experimental info pluginRobert Gemmell2012-03-0527-2469/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1297090 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3408 : Fix the Java Broker code so it both copes with machines where ↵Robert Godfrey2012-03-054-13/+27
| | | | | | IPv6 is present, but disabled, and does not open a random port to get a wildcard address git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1297049 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3408 : Remove IPv4 specific code from Java Broker, allow to bind to ↵Robert Godfrey2012-03-051-1/+1
| | | | | | IPv6 literals git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1297042 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3881: Ensure we only put 0-8/0-9/0-9-1 messages in the store if they ↵Robert Gemmell2012-03-059-85/+74
| | | | | | are actually routable. Remove some unused and test-only methods. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1297026 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3408 : Remove IPv4 specific code from Java Broker, allow to bind to ↵Robert Godfrey2012-03-051-31/+3
| | | | | | IPv6 literals git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1297013 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: delete the testkit module, it contains a single class which is ↵Robert Gemmell2012-03-036-445/+1
| | | | | | almost entirely commented out, and hasnt been modified since it was left behind 2 years ago when the module contents were moved into the tools module. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1296639 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3867: ManagedQueueMBeanTest, fix test issue causing sporadic failure on ↵Keith Wall2012-03-011-7/+12
| | | | | | some CI instances git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1295574 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2159: Remove create-example-ssl-stores script from Java Broker.Keith Wall2012-03-014-79/+2
| | | | | | Removed create-example-ssl-stores(.bat|.sh). Removed references to script from code, config and docbook. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1295486 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3599: Python session tests fail against the Java Broker due to ↵Keith Wall2012-03-012-4/+3
| | | | | | | | | | | | | | | | | | | | unexpected redelivered status Changed Java Broker so once a message is acknowledged, if the session is transactional and the transaction is rolled-back, the queue entry is marked as redelivered. The rationale is that if the client has acknowledged, then it is certain they have seen it/them. The python tests testCommitAck and testRollback highlighted this defect as they acknowledge the session before rollback (something that is impossible to control from the JMS API). Python tests reenabled against the Java Broker: qpid.tests.messaging.endpoints.SessionTests.testCommitAck qpid.tests.messaging.endpoints.SessionTests.testRelease qpid.tests.messaging.endpoints.SessionTests.testRollback Work of Robbie Gemmell <robbie@apache.org> and myself. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1295474 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3605: update test comments to reflect change in broker behaviour after ↵Robert Gemmell2012-03-011-2/+4
| | | | | | the changes in this JIRA git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1295348 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3605 : renamed method, corrected brace style for ifs, added tests (per ↵Robert Godfrey2012-02-292-12/+94
| | | | | | Robbies review comments) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1295341 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2418: fix up issues and enable forgotten test for 0-10 persistent ↵Robert Gemmell2012-02-293-14/+10
| | | | | | broker profiles git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1295301 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3871 - Fixed java build, added stub for missing attribute.Ted Ross2012-02-291-0/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1295123 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3867: Address review comment from Robbie GemmellKeith Wall2012-02-281-2/+14
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1294895 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3605 : [Java Broker] Durable subscriber with no-local true receives ↵Robert Godfrey2012-02-2811-21/+190
| | | | | | messages on re-connection git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1294884 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2478 : Removing exclusion from test profiles as the test now seems to passRobert Godfrey2012-02-281-4/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1294429 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2621 : [Java Client] Calling QueueBrowser.getEnumeration on a stopped ↵Robert Godfrey2012-02-272-0/+21
| | | | | | connection will hang git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1294397 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2020 : [Java Client] create[Durable]ConnectionConsumer should throw ↵Robert Godfrey2012-02-271-4/+5
| | | | | | JMSException, not return null (until such time as QPID-3693 is completed) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1294370 13f79535-47bb-0310-9956-ffa450edef68
* QPID-24 : [Java Broker] Fix potential leak of preparedstatement on exception ↵Robert Godfrey2012-02-271-3/+4
| | | | | | in derby store git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1294230 13f79535-47bb-0310-9956-ffa450edef68
* QPID-792 : [Java Client] Validate queue browser selector on client side, not ↵Robert Godfrey2012-02-277-41/+110
| | | | | | broker git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1294194 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3774: AcknowlegdeTest should also sync after sending more ↵Keith Wall2012-02-271-7/+11
| | | | | | non-transactional messages git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1294165 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: Remove unused authentication manager/queue memory-use methods from ↵Keith Wall2012-02-273-30/+3
| | | | | | virtual host implementation and configuration. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1294164 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: Java Broker: Remove unsed method from ContentHeaderBody.javaKeith Wall2012-02-271-11/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1294163 13f79535-47bb-0310-9956-ffa450edef68
* QPID-509 : [Java Client] Messages sent to topics should not default to mandatoryRobert Godfrey2012-02-271-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1294144 13f79535-47bb-0310-9956-ffa450edef68
* QPID-509 : [Java Client] Messages sent to topics should not default to mandatoryRobert Godfrey2012-02-277-138/+239
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1294135 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3867: AMQQueueMBean#clearQueue|moveMessages|copyMessages should be ↵Keith Wall2012-02-266-124/+320
| | | | | | | | | certain to rollback transactions in the event of exception Added finally{} block so txn will be rolled back in the event of any non-normal completion. Refactored the AMQQueue abstraction so that the caller no longer has to provide a server transaction for move and copy operations. Bolstered the system tests around copy and move JMX management operations. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1293951 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: rename the felix dep, we are using the 'main' bundle not the ↵Robert Gemmell2012-02-257-33/+62
| | | | | | 'framework' one. Enable specifying dependency exclusions during POM generation, exclude deps we dont use in the build git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1293690 13f79535-47bb-0310-9956-ffa450edef68
* QPID-24 : Fix potential NPE in log message on recovery of xids where the ↵Robert Godfrey2012-02-241-4/+1
| | | | | | queue was transient git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1293136 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1199 : [Java Client] Can not (actually you can) append to BytesMessage ↵Robert Godfrey2012-02-231-0/+43
| | | | | | | | after send Add test from JIRA to test suite showing problem no longer occurs git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1293034 13f79535-47bb-0310-9956-ffa450edef68
* AMQP-24 : [Java Broker] Implement distributed transactions for AMQP 0-10Robert Godfrey2012-02-2363-111/+2784
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1292984 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3325: move shutdown hook handling into Broker, set the thread nameRobert Gemmell2012-02-232-60/+66
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1292811 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3789: restore one of the improvements made in this JIRA which was ↵Robert Gemmell2012-02-221-8/+13
| | | | | | inadvertantly reverted during subsequent application of an older patch elsewhere git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1292521 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3325: unregister the shutdown hook when closing an ApplicationRegistry ↵Robert Gemmell2012-02-223-42/+81
| | | | | | instance (by means other than the shutdownhook having run) and tidy up [use of] the close() method. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1292479 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: Extend genpom's search path to include a modules private /lib directoryKeith Wall2012-02-221-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1292208 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3865: Remove unreliable CancelTestKeith Wall2012-02-221-101/+0
| | | | | | | | This test case is seen to fail occasionally on a slower CI box. The failure is a test issue; it uses a non-transactional producer to send the single test message, so the message may not have made it to the broker by the time the QueueBrowser is created. When the test fails, the browser sees no messages. The test won't be fixed as the test is duplicated by the better QueueBrowser*Test which uses a transactional publisher. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1292207 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3595 : Python Alternate Exchange tests fail against the Java BrokerRobert Godfrey2012-02-214-17/+47
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1292008 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3595 : Python Alternate Exchange tests fail against the Java BrokerRobert Godfrey2012-02-215-12/+41
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1291964 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3595 : Python Alternate Exchange tests (don't) fail against the Java BrokerRobert Godfrey2012-02-211-3/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1291881 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3594 : Python exclusive queue declaration test fails against Java BrokerRobert Godfrey2012-02-212-4/+8
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1291792 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3597 : Python Headers Exchange tests fail against Java Broker (Fix ↵Robert Godfrey2012-02-214-29/+76
| | | | | | ExchangeBound when matching arguments) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1291749 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3597 : Python Headers Exchange tests fail against Java Broker (Java ↵Robert Godfrey2012-02-212-3/+1
| | | | | | AMQP 0-10 transport cannot cope with message transfers with no body and no headers) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1291719 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3597 : Python Headers Exchange tests fail against Java Broker (Java ↵Robert Godfrey2012-02-212-3/+3
| | | | | | Broker only removes headers bindings if debug is enabled) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1291701 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status