summaryrefslogtreecommitdiff
path: root/qpid/java/client
Commit message (Collapse)AuthorAgeFilesLines
* QPID-3864: add/fix licences in the Java tree for 0.16Robert Gemmell2012-04-191-1/+1
| | | | | | | 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-112-21/+11
| | | | | | | | | | | | | | | | | | 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
* QPID-3864: Update version strings to 0.16Justin Ross2012-03-081-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.16@1298344 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3605 : [Java Broker] Durable subscriber with no-local true receives ↵Robert Godfrey2012-02-282-0/+8
| | | | | | messages on re-connection git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1294884 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2621 : [Java Client] Calling QueueBrowser.getEnumeration on a stopped ↵Robert Godfrey2012-02-271-0/+4
| | | | | | 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-792 : [Java Client] Validate queue browser selector on client side, not ↵Robert Godfrey2012-02-275-34/+101
| | | | | | broker git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1294194 13f79535-47bb-0310-9956-ffa450edef68
* QPID-509 : [Java Client] Messages sent to topics should not default to mandatoryRobert Godfrey2012-02-276-129/+150
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1294135 13f79535-47bb-0310-9956-ffa450edef68
* AMQP-24 : [Java Broker] Implement distributed transactions for AMQP 0-10Robert Godfrey2012-02-231-7/+10
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1292984 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3095 : AMQBrokerDetails equals() and hashCode() methods do not adhere ↵Robert Godfrey2012-02-201-4/+4
| | | | | | to contract git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1291353 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2660 : AMQMessageDelegate_0_10 uses Byte.valueOf() when converting ↵Robert Godfrey2012-02-202-0/+57
| | | | | | String properties to short, int, and long values git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1291260 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3836 Modified the address handling code to pass the noLocalRajith Muditha Attapattu2012-02-134-10/+19
| | | | | | argument to queue-declare method. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1243719 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3817: remove unnecessary cast to AMQQueue from the QueueBrowser ↵Robert Gemmell2012-02-132-3/+6
| | | | | | | | | creation path to allow their use with Address syntax 'destination.<address>' entries in JNDI properties files. Applied patch from Praveen Murugesan git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1243389 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3830: remove stale reference to old examples READMERobert Gemmell2012-02-131-2/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1243388 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3830: remove stale/confusing old 'examples' for the java clientRobert Gemmell2012-02-1327-2874/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1243385 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3831: use AcquireMode=PRE_ACQUIRED when using server-side selectors and ↵Robert Gemmell2012-02-136-16/+12
| | | | | | consuming from Queues. Remove unused method parameter for selector filter. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1243384 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3440: add test to verify issue by ensuring that the reply-to ↵Robert Gemmell2012-02-132-14/+85
| | | | | | Destination cache results in use of the same Destination objects for subsequent messages. Implement equals() and hashCode() for the generated ReplyTo class to let it function properly as an index in the hashmap to resolve the issue. Update PropertyValueTest to remember the initial reply-to destination it sets and compare it with the value returned after sending/receiving the message, rather than constituting its own test destination for comparison. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1243380 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3819: ExhaustiveACLTests seen to timeoutKeith Wall2012-02-091-24/+1
| | | | | | | | | Backout changes to AMQStateManager made by QPID-3512 as these changes were causing the client to hang for 30 seconds after the Broker closed connection due to ACL violation. Refactored ConnectionCloseTest (now called BrokerClosesClientConnectionTest) to avoid the sporadic failure by verifying that the closed connection is reported correctly to the client. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1242338 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3807: Improve thread safety of JMS Session dispatcher.Keith Wall2012-02-071-21/+11
| | | | | | Make _dispatcherThread/_dispatcher volatile and remove their unused setters. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1241430 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: Remove unnecessary getters added by recent commit 1236867Keith Wall2012-02-071-87/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1241429 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: Move members back to top of class where they belongKeith Wall2012-02-071-181/+180
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1241428 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: Remove redundant code from client and common trees.Keith Wall2012-02-063-134/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1241107 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3814: ensure the 0-10 client sends its version number during ↵Robert Gemmell2012-02-052-29/+16
| | | | | | ConnectionStart(Ok) process, align properties better across protocol versions, general tidy up of the property handling git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1240813 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3801 : [Java] Move JMS Selector code into commonRobert Godfrey2012-02-0220-2635/+222
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1239643 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3784: move the system property key into ClientPropertiesRobert Gemmell2012-02-022-7/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1239622 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3784: introduce system property to run a dispatcher thread as ↵Robert Gemmell2012-02-022-1/+77
| | | | | | | | damon/non-daemon thread. Changes dispatcher thread to be non daemon thread by default. Applied patch from Andrew MacBean <andymacbean@gmail.com> and Oleksandr Rudyy<orudyy@gmail.com>. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1239620 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3790: Add a method AMQSession.getQueueDepth(AMQDestionation, boolean) ↵Robert Gemmell2012-02-014-14/+59
| | | | | | | | to sync session (if specified) before sending QueueQuery command Applied patch from Andrew MacBean <andymacbean@gmail.com> and Oleksandr Rudyy<orudyy@gmail.com>. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1239166 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3789 : [Java Broker] Remove duplication between two password file ↵Robert Godfrey2012-02-013-3/+0
| | | | | | database implementations git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1239112 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3789 : [Java] Remove duplication of BytesDataOutput inner class, and ↵Robert Godfrey2012-01-315-419/+199
| | | | | | shared code in SessionAdapt[eo]rs git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1238868 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3604 Moved the draining of consumer queues further down to be doneRajith Muditha Attapattu2012-01-311-8/+6
| | | | | | | after we drain the dispatch queue. Since the message flow is now stopped we can drain the queues without grabbing the message-delivery-lock. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1238688 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3789 : [Java] Remove dead code and empty directoriesRobert Godfrey2012-01-303-601/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1237577 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3739: Java properties qpid.ssl.keyStoreCertType and ↵Keith Wall2012-01-291-2/+2
| | | | | | | | | | | | | | | qpid.ssl.trustStoreCertType have misleading names and would be better called qpid.ssl.[Key|Trust]ManagerFactory.algorithm * Introduced two properties qpid.ssl.KeyManagerFactory.algorithm and qpid.ssl.TrustManagerFactory.algorithm to allow a client user to override the algorithm name used when Qpid client constructs a KeyManager or TrustManager. * Continued to support qpid.ssl.keyStoreCertType and qpid.ssl.trustStoreCertType (now marked as deprecated) * Introduced a new Java Broker configuration key connector/ssl/keyManagerFactoryAlgorithm * Continued to support broker configuration key connector/ssl/certType (now marked as deprecated and will issue warning if used). * Changed the default from hardcoded 'SunX509' to the value(s) returned by KeyManagerFactory#getDefaultAlgorithm() and TrustManagerFactory#getDefaultAlgorithm(). This allows the Java Broker and Client to be used out of the box on non-Sun JDKs without having to set qpid.ssl.KeyManagerFactory.algorithm or qpid.ssl.TrustManagerFactory.algorithm. * Updated client docbook documentation. Tested both Java Broker and Client on IBM JDK and ensured all 0-10 and 0-9-1 profiles pass (including SSLTest which was failing prior to this change). git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1237504 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3789 : [Java] fix regression caused by destination cache miss (by ↵Robert Godfrey2012-01-292-1/+7
| | | | | | further screwing with equality on AMQDestination) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1237331 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3789 : [Java] code tidyupsRobert Godfrey2012-01-2952-1640/+211
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1237273 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: Encapsulate fields, use private members and accesors (keep ↵Robert Godfrey2012-01-2764-665/+1065
| | | | | | checkstyle happy) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1236867 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: Ensure all control flow statements use braces (keeping CheckStyle ↵Robert Godfrey2012-01-275-40/+141
| | | | | | happy) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1236647 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA : [Java] Tidy up import statements across the codebase, remove ↵Robert Godfrey2012-01-27149-957/+807
| | | | | | unused/redundant imports (keep Checkstyle happy) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1236638 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3786 Setting queueName, exchange and routingKey from informationRajith Muditha Attapattu2012-01-261-1/+15
| | | | | | given in the incomming message. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1236355 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3265 This is not a fix for this issue, but rather a minor step towards it.Rajith Muditha Attapattu2012-01-261-4/+4
| | | | | | | | It's incorrect to add the binding for the temp queue to the bindings object as if the destination is used with another consumer it will interfere. Therefore the qeueu bind is sent explictly. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1236198 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3604 Added sync() after sending message stop for each subscriber.Rajith Muditha Attapattu2012-01-241-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1235553 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3604 Once message stop is issued for each subscriber, the clientRajith Muditha Attapattu2012-01-242-1/+93
| | | | | | | | | | now drains the internal queues of each subscriber. It also drains the dispatch queue. These messages are then released without marking them as redelivered. Messages that were given to the application but were not acked are also released, but are marked as redelivered. All messages received upto that point are marked as completed. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1235550 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3688 Added a default constructor and allowed the destination string to ↵Rajith Muditha Attapattu2012-01-184-1/+34
| | | | | | be set and retrivied via a setter & getter. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1232992 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3763 Committing a patch by Weston Price.Rajith Muditha Attapattu2012-01-171-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1232605 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3761: rename the fallback config to ensure it isnt just picked up by ↵Robert Gemmell2012-01-161-1/+1
| | | | | | Log4J automatically scanning the classpath git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1232031 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3604 Reverting the changes as it releases messages everytime theRajith Muditha Attapattu2012-01-112-38/+8
| | | | | | channel is suspended. This results in several test failures. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1230088 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3604 The code now drains individual consumer queues as well as theRajith Muditha Attapattu2012-01-112-6/+38
| | | | | | | | | dispatch queue (via syncDipatchQueue method) and releases both unacked and prefetched messages, while only the former being marked redelivered. Also all of these transfers are being marked as completed to ensure credits don't dry up. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1229857 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3279, committing a patch by Weston Price.Rajith Muditha Attapattu2012-01-101-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1229754 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1644 : Fix 0-8 Java Client to only declare amq.* exchanges passively ↵Robert Godfrey2012-01-081-9/+12
| | | | | | when creating a producer git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1228843 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3715: Fix the receiving of an empty ObjectMessage (without a body)Keith Wall2012-01-071-39/+13
| | | | | | Applied patch from Oleksandr Rudyy<orudyy@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1228583 13f79535-47bb-0310-9956-ffa450edef68