summaryrefslogtreecommitdiff
path: root/qpid/java/broker/src
Commit message (Collapse)AuthorAgeFilesLines
...
* QPID-3823: ServerSession unblock(AMQQueue) can cause NPE when trying to ↵Keith Wall2012-02-094-67/+85
| | | | | | | | remove a queue from _blockingQueues Map that is not present Applied patch from Andrew MacBean <andymacbean@gmail.com> and Philip Harvey <phil@philharveyonline.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1242408 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3821: Uncaught exception thrown in QueueRunner.run() could cause ↵Keith Wall2012-02-092-21/+30
| | | | | | QueueRunner to remain stuck in RUNNING state permanently git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1242339 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3809: Java Broker killed by java.net.SocketException: Broken pipe ↵Keith Wall2012-02-071-6/+18
| | | | | | | | (killed by uncaught exception handler) Applied patch from Andrew MacBean <andymacbean@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1241433 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3816: add client version to connection open loggingRobert Gemmell2012-02-066-22/+56
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1241257 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3756: Reorder Java Broker's connection close process so that ↵Keith Wall2012-02-061-4/+9
| | | | | | | | | ConnectionCloseOk is sent only after first updating its internal state. This change means that the connection mbean will be deregistered from JMX before sending ConnectionCloseOk, thus removing the possibility of the race condition. The client side process is unaffected by this change. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1241024 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3815: remove duplicate setting of the NetworkConnection, this was ↵Robert Gemmell2012-02-061-1/+0
| | | | | | already done via the delegate ProtocolEngines constructor git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1240868 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: remove factory method only used by testRobert Gemmell2012-02-062-8/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1240866 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3814: ensure the 0-10 client sends its version number during ↵Robert Gemmell2012-02-059-73/+48
| | | | | | 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-3812: ExceptionListenerTest sporadically fails on java-mms-0.10Keith Wall2012-02-051-5/+9
| | | | | | Remove possibility of race condition by updating Broker state *before* sending the connection reply. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1240708 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3813: allow configuring the default version reply to an unsupported ↵Robert Gemmell2012-02-045-24/+95
| | | | | | protocol version initiation git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1240644 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3794: calculate a sleep interval to account for previous overlsleep, to ↵Robert Gemmell2012-02-041-1/+6
| | | | | | | | | help avoid ocasional failures in StatisticsCounterTest.testPeakOutOfOrder Applied patch from Oleksandr Rudyy <orudyy@gmail.com> (with small update to prevent a negative value being used) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1240518 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3805: Remove allow-all/deny-all security plugins from Java Broker.Keith Wall2012-02-024-206/+5
| | | | | | Remove allow-all/deny-all security plugins as equivilent functionality is offerred by the ACL plugin. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1239889 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3802: Broker command line processing --help (-h) and --version (-v) no ↵Keith Wall2012-02-023-52/+99
| | | | | | | | longer work Applied patch from Andrew MacBean <andymacbean@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1239759 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3801 : [Java] Move JMS Selector code into commonRobert Godfrey2012-02-0217-2847/+116
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1239643 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3800: add the ability to disable particular protocol versions ↵Robert Gemmell2012-02-024-13/+96
| | | | | | broker-wide to save having to exclude them from individual ports git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1239579 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3789 : Fix AbstractPasswordFilePrincipalDatabase to remove possibility ↵Robert Godfrey2012-02-021-6/+13
| | | | | | of leaked open stream git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1239496 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3789 : [Java Broker] Remove duplication between two password file ↵Robert Godfrey2012-02-018-933/+606
| | | | | | database implementations git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1239112 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3780 : guard against the possibility that the HWM is older than the ↵Robert Godfrey2012-02-011-1/+1
| | | | | | queue head git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1239095 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3780 : guard against the possibility that the HWM is older than the ↵Robert Godfrey2012-02-011-0/+8
| | | | | | queue head git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1239094 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3789 : [Java] Remove duplication of BytesDataOutput inner class, and ↵Robert Godfrey2012-01-311-155/+1
| | | | | | shared code in SessionAdapt[eo]rs git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1238868 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3789 : [Java] Remove duplication of output converters and optimise ↵Robert Godfrey2012-01-308-913/+59
| | | | | | startup time git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1237772 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3789 : [Java] Remove dead code and empty directoriesRobert Godfrey2012-01-3011-560/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1237612 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3789 : [Java] Remove dead code and empty directoriesRobert Godfrey2012-01-305-783/+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-293-8/+29
| | | | | | | | | | | | | | | 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] code tidyupsRobert Godfrey2012-01-2974-749/+326
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1237273 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3788: Remove remaining MINA configuration keys (and those from other ↵Keith Wall2012-01-282-27/+2
| | | | | | | | | | retired impls) from the Java Broker's config.xml * Remove remaining references to MINA transport configuration keys: enableDirectBuffers/enablePooledAllocator/filterchain from code and example config files. * Remove references to compressBufferOnQueue from config XMLs. The implementation that used it was removed back in 2007 by QPID-275. * Remove references to broker-side configuration key enableJMSXUserID. This broker feature was removed by QPID-943 (which replaced the functionality with an equivilent client-side option). The old Broker side key plays no part in the client-side function. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1237088 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: Encapsulate fields, use private members and accesors (keep ↵Robert Godfrey2012-01-2773-295/+566
| | | | | | 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-279-9/+47
| | | | | | 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-27373-1503/+1608
| | | | | | unused/redundant imports (keep Checkstyle happy) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1236638 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3559: AMQQueueMBean: Switched timestamp formatting to static ↵Keith Wall2012-01-261-18/+11
| | | | | | | | FastDateFormat instance to avoid the need for synchronisation or the generation of lots of SDF and Date instance garbage. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1236397 13f79535-47bb-0310-9956-ffa450edef68
* QPID-946, QPID-2379 : code review - move statements inside try blockRobert Godfrey2012-01-261-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1236332 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3780 : [Java Broker] reduce scavenge overhead on large queuesRobert Godfrey2012-01-251-18/+26
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1235771 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3774 : allow out of order completion of persistent enqueues / dequeues ↵Robert Godfrey2012-01-2119-37/+144
| | | | | | (0-9 codepath) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1234215 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3774 : allow out of order completion of persistent enqueues / dequeuesRobert Godfrey2012-01-206-41/+484
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1234111 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3756: ManagedConnectionMBeanTest.testChannels occasionally fails on ↵Keith Wall2012-01-181-19/+31
| | | | | | | | | | | 0-10 spawned profiles This problem is caused by the connection mbean being deregistered too late (as the TCP/IP socket) is closed, thus creating a race between the client using JMX to observe connection state, and the unregistering of the bean. This patch changes the 0-10 code path to unregister the bean on receipt of ConnectionClose and before ConnectionCloseOkay is sent to the client. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1232785 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3720 : Fix issue with default group assignment pointed out by RobbieRobert Godfrey2012-01-161-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1232058 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3762: make sure to close the IoSender when the IoReciever indicates the ↵Robert Gemmell2012-01-161-1/+8
| | | | | | TCP connection went away, fixes leak for forcefully clsoed 0-9-1 connections git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1232032 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3761: rename the fallback config to ensure it isnt just picked up by ↵Robert Gemmell2012-01-162-5/+5
| | | | | | Log4J automatically scanning the classpath git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1232031 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3697: SortedQueue synchronisation can cause deadlockKeith Wall2012-01-134-3/+86
| | | | | | | Sorted queue enqueue() should lock on a private rather than the lock of the object to avoid the possibility of a deadlock with a thread performing subscription operations. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1231095 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3753 : [Java Broker] Improve automatic conversion of messages between ↵Robert Godfrey2012-01-126-27/+88
| | | | | | 0-8/9/9-1 and 0-10 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1230661 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3720 : Fix bug which causes failure in 0-9-1 tests, namely ↵Robert Godfrey2012-01-111-3/+3
| | | | | | SimpleAMQQueue.QueueEntryListener assuming that all listeners are of the same type git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1230251 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3720 : Remove debugging log statementsRobert Godfrey2012-01-111-3/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1230013 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3720 : Add alternative (C++ style) grouping and apply comments from ↵Robert Godfrey2012-01-114-144/+489
| | | | | | Robbie Gemmel git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1229996 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3717 - Fixes based on review by Robbie GemmellRobert Godfrey2012-01-111-9/+7
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1229943 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3730: remove ReadWriteJobQueue, it is no longer necessary as the only ↵Robert Gemmell2012-01-095-50/+8
| | | | | | things now using the thread pool are write jobs, so there is no need/benefit to request it be write-biased. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1229112 13f79535-47bb-0310-9956-ffa450edef68
* NO-JIRA: remove unused codeRobert Gemmell2012-01-092-5/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1229111 13f79535-47bb-0310-9956-ffa450edef68
* QPID-946 , QPID-2379 : QMF and Federation fixes (now works again with ↵Robert Godfrey2012-01-0726-143/+1178
| | | | | | qpid-config, qpid-route, qpid-tool) and store (durable) routes in the DB git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1228748 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3715: Fix the receiving of an empty ObjectMessage (without a body)Keith Wall2012-01-073-89/+2
| | | | | | 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
* QPID-3704: OutOfOrderQueue#checkSubscriptionsNotAheadOfDelivery cannot ↵Keith Wall2012-01-051-7/+3
| | | | | | consider _lastSeenEntry when determing if _releasedEntry should be retarded git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1227582 13f79535-47bb-0310-9956-ffa450edef68
* QPID-464 : Attempt to log error using log4j before shutting downRobert Godfrey2012-01-041-0/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1227163 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status