summaryrefslogtreecommitdiff
path: root/java/common
Commit message (Collapse)AuthorAgeFilesLines
* Merged out from trunkQPID-2519Stephen D. Huston2011-10-21132-11112/+3222
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1187375 13f79535-47bb-0310-9956-ffa450edef68
* Undo bad merge from trunk - merged at wrong level.Stephen D. Huston2011-10-21132-3183/+11110
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1187150 13f79535-47bb-0310-9956-ffa450edef68
* Merge trunk to QPID-2519 branchStephen D. Huston2011-10-20132-11110/+3183
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1186990 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3029: Set channel and heatbeat max to correct valuesAndrew Donald Kennedy2011-02-181-5/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1071972 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3065: Tidy up unused parts of DisassemblerAndrew Donald Kennedy2011-02-171-25/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1071700 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3028: only hold the bytes for the cached string, instead of the entire ↵Robert Gemmell2011-02-172-1/+18
| | | | | | network read buffer array git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1071676 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3028: use a small array and companion HashMap to store the incomplete ↵Robert Gemmell2011-02-171-13/+42
| | | | | | Methods, rather than pre-allocating a 64000 entry array git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1071675 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3028: make assembler and disassembler use a static ThreadLocal for its ↵Robert Gemmell2011-02-173-7/+12
| | | | | | BBEncoder and BBDecoder, release buffer from BBDecoder when complete git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1071674 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3065: Send header and frame data as single bufferAndrew Donald Kennedy2011-02-171-10/+13
| | | | | | | The Disassembler now fills a ByteBuffer with the entire frame contents before passing it to the Sender. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1071641 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3056: remove the unused SSL certificate, and then also the newly-empty ↵Robert Gemmell2011-02-141-0/+0
| | | | | | resources folder itself git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1070544 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3043Rajith Muditha Attapattu2011-02-111-1/+1
| | | | | | | | | I had accidently marked the 'connectionLost' variable static. Removing the static identifier from the said variable. Thanks to Andrew Kennedy for spotting this. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1069858 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3043Rajith Muditha Attapattu2011-02-092-3/+23
| | | | | | | Added the extra state 'RESUMING', to ensure that any new session creation is delayed until the connection is able to reattach all existing sessions. If a connection is reconnecting then it will first go to RESUMING state (instead of OPEN) in connection-open-ok. Once the 'resume' method in Connection.java is completed the state will be set to OPEN. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1069159 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2994Rajith Muditha Attapattu2011-02-092-3/+16
| | | | | | | | | | | | | | | | | The commit made in rev 1068661 will only close and throw an exception if the user tries to invoke an action (Ex sending a message or calling commit) on the transactional session while failover is in progress (i.e session in detached state). We also need to handle the case where the application is not doing anything during failover. But the application may still be in the middle of an uncommitted transaction. Therefore any session that is marked transactional should not be resumed. This commit removes tranactional sessions and close them inside the 'resume' method in Connection.java Any subsequent operation on this session will cause an exception being thrown, saying the session is closed. However the exception doesn't really contain the reason, other than to say the session is closed. The Java client in general needs a better error reporting scheme to convey more information to a client application. That will be handled under a separate JIRA. For the purpose of this JIRA the session being closed is good enough for the time being. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1069105 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3042Rajith Muditha Attapattu2011-02-091-0/+11
| | | | | | | The createSession method in Connection.java now waits until the connection state == OPEN before it actually sends the session-attach on the wire. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1068696 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2994Rajith Muditha Attapattu2011-02-081-1/+11
| | | | | | | | | If the session is transactional, in the invoke method the session state is checked to see if it has dettached. If so the session is removed from the internal map maintained by the connection object. This prevents it from being resumed. An exception is also thrown notifying that failover may have happened in the middle of a transaction and the session is closed. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1068661 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3029: actually set and negotiate the supported max num channels per ↵Robert Gemmell2011-02-043-19/+61
| | | | | | connection during connection handshake. Enable/make the 0-10 client use channel numbers 0 to N-1 in line with the spec, rather than 1-N. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1067210 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3021: ensure the connection actor is used for connection control events ↵Robert Gemmell2011-02-044-0/+19
| | | | | | regardless of a particular sessions existence git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1067208 13f79535-47bb-0310-9956-ffa450edef68
* QPID-1670: Implement an UncaughtExceptionHandler to log exceptions causing ↵Robert Gemmell2011-02-046-34/+332
| | | | | | | | | the permature termination of Qpid client threads. Applied patch from Keith Wall <keith.wall@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1067108 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3021: set the session/connection actor when the connection recieves new ↵Robert Gemmell2011-01-272-6/+2
| | | | | | events, ensure the correct thread logs close git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1064084 13f79535-47bb-0310-9956-ffa450edef68
* QPID-3010: ensure the SimpleByteBufferAllocator is always used and ↵Robert Gemmell2011-01-211-8/+8
| | | | | | non-direct ByteBuffers are the default, remove the old and now unused configuration methods from ServerConfiguration and update the example config.xml accordingly git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1061865 13f79535-47bb-0310-9956-ffa450edef68
* While commiting a fix for QPID-2994 I accidently modified the timeout value.Rajith Muditha Attapattu2011-01-111-1/+1
| | | | | | | I am restoring it to the original value. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1057927 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2995Rajith Muditha Attapattu2011-01-111-0/+4
| | | | | | | The redelivered flag is now set on messages that are restransmitted after failover. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1057462 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2994Rajith Muditha Attapattu2011-01-111-3/+9
| | | | | | | When the session is marked transactional, message transfers are not replayed. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1057460 13f79535-47bb-0310-9956-ffa450edef68
* Increment version numbers from 0.7 to 0.8(docs) and 0.9(code)Robert Gemmell2010-11-071-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1032374 13f79535-47bb-0310-9956-ffa450edef68
* add ASF licence to various files in the java treeRobert Gemmell2010-10-311-0/+19
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1029523 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2839 Add channel (CHN) Operational Loggin on 0-10Andrew Donald Kennedy2010-10-032-3/+3
| | | | | | Committed patch from SorinS <ssuciu@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1003985 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2835 Implement CON Operational Logging on 0-10Andrew Donald Kennedy2010-10-033-14/+19
| | | | | | Committed patch from SorinS <ssuciu@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1003984 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2857: Fix issue identified by running FindBugs across the codebase. ↵Robert Gemmell2010-10-011-4/+11
| | | | | | Close reader when it is no longer required git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1003479 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2872: make the broker indicate a heartbeat max of 0sec to cause the ↵Robert Gemmell2010-09-261-1/+6
| | | | | | | | | client disable heartbeating, as it otherwise enables the connection idle timeout by default and the broker cant generate them. Needed until QPID-2796 is undertaken to implement broker support for generating heartbeats. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1001544 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2861Rajith Muditha Attapattu2010-09-211-1/+1
| | | | | | | Adjusted the log message. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@999189 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2876Rajith Muditha Attapattu2010-09-211-2/+2
| | | | | | | Only message transfers are stored in the internal command array. This array is used for replaying after failover. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@999188 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2781: move broker process name tagging default from the common qpid-run ↵Robert Gemmell2010-09-191-6/+0
| | | | | | used by multiple scripts, into the qpid-server script it is associated with git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@998696 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2619: move echo of the broker PID from common qpid-run script used by ↵Robert Gemmell2010-09-191-1/+1
| | | | | | multiple scripts into qpid-server script. Change default pid filename to indicate association with qpid-server. Make filename configurable to allow choosing name e.g. for capturing pid of multiple servers" git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@998695 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2861Rajith Muditha Attapattu2010-09-171-1/+11
| | | | | | | | Added a simple null check to eliminate acting on a result that is no longer valid. I am also adding a log message at "WARN" level if we receive a result for a command that is no longer in our map. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@997965 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2857 : Address issues found by running FindBugs against the Java codebaseRobert Godfrey2010-09-1223-73/+162
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@996393 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2855 : Broker Transport should not block on awaiting session close ↵Robert Godfrey2010-09-121-12/+28
| | | | | | confirmation git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@996303 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2829: Remove the o.a.q.transport.Echo class as it is not usedRobert Gemmell2010-09-051-73/+0
| | | | | | | Applied patch from Sorin Suciu <ssuciu@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@992902 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2826: The class o.a.q.transport.Result is not used and can be safely ↵Robert Gemmell2010-09-051-30/+0
| | | | | | | | | removed Applied patch from Sorin Suciu <ssuciu@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@992901 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2825: The class o.a.q.transport.Sink is not used and can be safely removedRobert Gemmell2010-09-051-138/+0
| | | | | | | Applied patch from Sorin Suciu <ssuciu@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@992900 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2657: Correct handling of sync on 0-10 client session for exceptionsAndrew Donald Kennedy2010-08-135-30/+42
| | | | | | | | | | AMQSession_0_10 is modified to contain a pair of get/set methods for the current exception, using the set method to post the exception to the listener. The sync method will now throw an exception if one has occurred and all other methods that used to call sync()/getCurrentException() can just call sync(0 and get the expected behaviour. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@985262 13f79535-47bb-0310-9956-ffa450edef68
* Make ConnectionTest extend QpidTestCaseAndrew Donald Kennedy2010-08-131-3/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@985261 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2797: Never set expiry, and respond with 0 alwaysAndrew Donald Kennedy2010-08-131-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@985260 13f79535-47bb-0310-9956-ffa450edef68
* Tidy up various badly named testsAndrew Donald Kennedy2010-08-131-0/+48
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@985259 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2799: Convert address with underscores for temp queue nameAndrew Donald Kennedy2010-08-131-21/+32
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@985202 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2797: Change expiry to a boolean correctly representing intent to closeAndrew Donald Kennedy2010-08-133-15/+22
| | | | git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@985199 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2787: Move QpidTestCase to Common test module so that any test can ↵Robert Gemmell2010-08-061-0/+130
| | | | | | | | | inherit from it, allowing exclusions to be applied. Add ability to gather the class name of the message store associated with the test profile in use. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@982986 13f79535-47bb-0310-9956-ffa450edef68
* Don't request non-zero session expiration (as resume is not supported at ↵Gordon Sim2010-08-051-1/+1
| | | | | | this time) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@982517 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2718: Update the common.bnd version to 0.7.0Robert Gemmell2010-08-011-1/+1
| | | | | | | Applied patch from Sorin Suciu <ssuciu@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@981269 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2744: Unify 0-10 and 0-8 error messages for invalid object types in ↵Andrew Donald Kennedy2010-08-013-2/+15
| | | | | | properties git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@981231 13f79535-47bb-0310-9956-ffa450edef68
* QPID-2619: Capture broker pid on QPID_WORKAndrew Donald Kennedy2010-07-311-1/+1
| | | | | | | Applied patch from Sorin Suciu <ssuciu@gmail.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@981106 13f79535-47bb-0310-9956-ffa450edef68