GitHub user cabeaulac opened a pull request:
https://github.com/apache/camel/pull/11
CAMEL-2624 pull request
Fix for asynchronous mina2 producers and consumers.
This patch will affect current users of mina2 if they don't handle null
bodies in messages. Exchanges are sent with null bodies for session created,
session opened and session closed events. This allows IoHandlers to be used
asynchronously on the producer side and Processors to be used for asynchronous
message handing on the consumer side.
If you pull and apply the patch, I will resolve CAMEL-2624.
Regards,
Chad
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/cabeaulac/camel CAMEL-2624
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/camel/pull/11.patch
----
commit 8bbb0ed189628b5e93660b4b9c6bb0ab6f1130d5
Author: Chad Beaulac <c...@objectivesolutions.com>
Date: 2012-02-20T14:13:21Z
CAMEL-2624 incremental commit to track session creation.
commit 0b570b218f015bb055a8a66e181294342cf16938
Author: Chad Beaulac <c...@objectivesolutions.com>
Date: 2012-02-20T14:14:31Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit 24e3572a4fcd068c02cd18d14028ad7eadce2509
Author: Chad Beaulac <c...@objectivesolutions.com>
Date: 2012-02-27T17:20:18Z
HFX-2624 Unit test for SessionCreated passes.
Changed log file name from ftp to mina2.
Changed constants to use MINA2 string instead of MINA.
commit 4abd1d09fdaf77e4b45ceea98855e233d11fccc1
Author: Chad Beaulac <c...@objectivesolutions.com>
Date: 2012-02-27T17:47:13Z
CAMEL-2624 Added unit test to track session create, open, complete.
commit 2f5f9aec102285363ab81d06e91f57a5b370a29c
Author: Chad Beaulac <c...@objectivesolutions.com>
Date: 2012-02-27T18:01:11Z
CAMEL-2624 Cleanup for unit test to track session.
commit 143b171c46d60c43545fa10d8f3252a3485fbf55
Author: Chad Beaulac <c...@objectivesolutions.com>
Date: 2012-03-04T00:12:28Z
CAMEL-2624 Mina2TcpAsyncOutOnly has 3 unit tests passing now.
The testMina2ProducerWithIoHandler test connects to a consumer and then
receives 300 messages asynchronously. There are still many issues to work out.
There is code for inOut and sync behavior that has to be gutted to be entirely
asynchronous. I'll do that one unit test at a time.
commit 492d8553bb60635dea0b7894142f5a4e0465b40c
Author: Chad Beaulac <c...@objectivesolutions.com>
Date: 2012-03-11T16:39:12Z
CAMEL-2624 Mina2ClientServerTest and Mina2TcpAsyncOutOnlyTest pass now.
There might be a race condition between closing the session from the IoHandler
and sending another message with the ProducerTemplate. Will re-investigate
later if test fails. Porting other tests to full-async behavior now.
commit be184d1c9907f2288125d219a53892020fa2e771
Author: Chad Beaulac <c...@objectivesolutions.com>
Date: 2012-03-11T22:50:32Z
CAMEL-2624 Modified some debug code
commit 8c9589aee79c8c1df883ede0db73411d8a9ea61d
Author: Chad Beaulac <c...@objectivesolutions.com>
Date: 2012-03-18T16:07:12Z
CAMEL-2624 Merged with upstream changes.
commit 1cde0236ba0481c961ea22861c76aa51ffc02df9
Author: Chad Beaulac <c...@objectivesolutions.com>
Date: 2012-03-18T16:08:57Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit 661583181ae752f63cea2223a98b23d5c5b59c5b
Author: Chad Beaulac <c...@objectivesolutions.com>
Date: 2012-04-01T00:49:51Z
Added IoHandlerAdapter to Mina2Configuration
commit 65c28c0512c9ba4260ccdaa1933af5696e59c021
Author: Chad Beaulac <c...@objectivesolutions.com>
Date: 2012-04-01T00:50:46Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit db2eed45300cff1f36448eb17122ad246e6fce29
Author: Chad Beaulac <c...@objectivesolutions.com>
Date: 2012-04-22T15:40:48Z
CAMEL-2624 Merged with upsteam changes.
commit 2b590ac4baf5d7405573fd42d257f3603e0b08de
Author: Chad Beaulac <cabeaulac@chadmac.local>
Date: 2012-05-12T12:53:56Z
Merge branch 'trunk' into osi_b
commit 535c878fe0f1e2acb5bfd44863a9aeb848b2f65c
Author: Chad Beaulac <cabeau...@chadmac.home>
Date: 2012-05-22T11:50:46Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit d8069c9c64c08746fd0149a2eff06f8f3db0b76a
Author: Chad Beaulac <cabeau...@chadmac.home>
Date: 2012-05-28T11:55:06Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit e427ecb346e44df9fc89edec97806cf735d91b86
Author: Chad Beaulac <cabeaulac@chadmac.local>
Date: 2012-06-10T10:17:59Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit d53e31e8e524c80044630152c6f0b5a69a872952
Author: Chad Beaulac <cabeau...@chadmac.home>
Date: 2012-06-12T11:55:58Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit ee150ff60358fbaec12ada46c771c1ff82f6b310
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2012-06-29T11:33:28Z
Merged with upstream changes
commit f833a7749d8b07abd4858f132ad22d8372ded103
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2012-06-29T12:07:33Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit be3fb70e60272a48f709800dfa5932e040d77ca4
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2012-06-30T20:02:20Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit 77d74d7d8c4e9c8522e38c7cc68683226bdd1c6b
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2012-07-02T11:34:51Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit 9f78942a5606273c878327ebf80e23fa29e32bff
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2012-07-05T13:35:47Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit e4770ff8b087d86bef051ea86f1cf302f3b3c1dd
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2012-07-07T15:00:35Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit fbddfcb02781f6903ff64c2e33b4b1a79bc97cc1
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2012-07-22T13:44:51Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit 3d6c8de9e9d90e765dcb7756384f61454271f1f6
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2012-07-31T11:08:09Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit 1d725eb31b47393559af27c47c30419eda75de5d
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2012-08-03T12:47:15Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit 7cb5d6f88c51384394c27238f1b1d44f09407492
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2012-08-03T21:55:56Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit b4d1fa1adf6bd1c989351d67db4a0f21609cdfcd
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2012-08-10T11:47:05Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit 0ed83e1c2c90a7d961f63a1f8086e158e8c9a295
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2012-08-18T12:35:51Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit 8bae5bae63be8e08bd5e69968d7e4ee5a5652500
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2012-08-18T20:28:16Z
CAMEL-2624 Initial commit after reverting to HEAD. Integrating Asyc
IoHandler funtionality back in.
Changed test log file name from ftp to mina2.
Updated Mina2Configuration with an IoHandler attr.
Changed Mina2Constants to put a 2 in the constant names. Added more
constants.
commit 1b875edd87d6f6f712d2b2df8f64732c7c8dd8c0
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2012-09-29T15:08:16Z
CAMEL-2624 Changes to track session creation
commit 6611e38837fe5a708d07a3ca327ac2a5180a4cd6
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2012-10-06T13:33:36Z
CAMEL-2624 Incremental commit to add IoHandlerAdapter to Mina2Confirugation
commit 921288742b731ade9b7ef1e864383154bada5769
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2012-10-06T13:34:25Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit 69885536620d1bda8bb23d0628869a400be4a0b7
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2012-10-06T15:52:28Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit 2729239726aab4d26b20d31c6092136c957c0a30
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2012-10-07T13:26:12Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit 1a0b87de92c08a070509fee00c4d2d0f64de3e15
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2012-10-07T14:42:02Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit f0de9f146cfca09cfe7943cd0313b2c7292c141c
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2012-10-14T13:55:31Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit 7eded638959bc8a0fa55f08cfb57a05001e645cf
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2012-10-16T12:13:11Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit 5b4b874c00abfa26eef0e57afe3d275b7badc395
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2012-10-29T11:54:35Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit 821c4bad283a2fde598a767be4f30d0ad52e83f4
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2012-10-30T18:54:36Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit 6e7474d0f504fd118e38f16f7921e334f041a96a
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2012-11-01T01:57:00Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit 2a176d0acc7c026416e2b729d35cb2e82dc0f474
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2012-11-22T13:56:19Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit 53903a5e340ebe28f136f9eb6f95baa4f48546dc
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2012-11-23T14:28:12Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit b6faff4a925e0e74ef4305d2e0ade0072ba40099
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2012-12-14T16:21:38Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit 79f0b033afe28b566b7fcd37e4e26eb16ba2675a
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2012-12-23T12:38:09Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit a150e6bb5124e5a83fd779316f6a2b3cda0d1ef4
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2012-12-26T16:15:40Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit 394d65f4d0376349867f16ac05df615cb7327b8a
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2012-12-27T15:09:17Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit cae14011e5b7df8351eb4c69375cbaa277c194d7
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2012-12-28T14:58:54Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit b53bd4ec78c4103e3cef51b49247519bd601e6ce
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2013-01-03T13:40:36Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit 7b9d4e0903adc170b640322b9c17bb8bd0601a5d
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2013-01-04T13:25:19Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit 64b127c7c0c83ad9d86907d2ecc9a2d240ba08a6
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2013-01-12T14:56:21Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit e6165f828b2759e9f99ef583072a8adeeac9bdc3
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2013-01-13T17:18:19Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit 32386ebd422705b0994ef320dc030629df04e1ca
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2013-01-20T12:55:12Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit 2f1b308022537879f8e80b8a29221dbff9e927e6
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2013-01-21T13:43:53Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit 047b549b15e6b198c69c5bdfada4d7b3d2d247cb
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2013-01-22T13:40:58Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit ea880f0b8250a23654d698297a2d51bc95705f30
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2013-01-26T12:16:43Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit 3e53db114e3fd846ec1b0102bf5392e2e5b70648
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2013-01-27T14:06:20Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit eb1cf1a2ed744df0bd0a99bad72a9fd898120133
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2013-01-28T20:56:44Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit 8cb8a1523d47067846fd0a0fbfbf19e0da8604f1
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2013-01-31T13:36:14Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit b61215c542d5e6d530206f393cec06555832e3c4
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2013-02-03T14:04:00Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit 027c45a2616c185c219b412d25bef42416998109
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2013-02-04T14:05:36Z
CAMEL-2624 Code to support full async producer and consumer added. All unit
tests updated and pass. Some async unit tests added. Now I'll add a few more
tests to show how to use this new functionality better.
commit f53d34fd1eb280b1567d136640ff285b2bc0e315
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2013-02-04T14:06:07Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit 5b11d563dfa90f23093e6dbc30a0b3864df4d2e5
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2013-02-08T01:35:53Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit ad1e2e03066493db92559e104c8ef883ae004088
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2013-02-08T12:39:01Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit e5aa5216b0a9cad63a7102b23bbc45a114deaa49
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2013-02-09T13:56:18Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit c9b468996b7ff665a009f8c810f51efe77c9eb06
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2013-02-10T14:21:47Z
Merge branch 'trunk' of git://git.apache.org/camel into trunk
commit bb005174f38b6390d68cdbb9d3ba7ea004aa320f
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2013-02-10T17:34:48Z
Merge branch 'trunk' of github.com:cabeaulac/camel into trunk
commit 93a5cc8d1c204f3bfe833d6ae66ae80924f8ecc1
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2013-02-10T18:37:19Z
CAMEL-2624 Updated Mina2SpringEMinaEndpointTest to expect 4 message bodies
to account for the session created, session opened, message, session closed
pattern
commit 0c665998cc9b301682b39964f51821903c7f13a5
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2013-02-10T19:21:52Z
CAMEL-2624 Updated Mina2Consumer. Uncommented logging code.
Mina2ClientServerTest - Added tests using IOHandlers to receieve message
responses and close connections. The sync attribute is only used in the
request-reply pattern and must be set to false when using full asyc pattern
with IOHandlers.
Mian2NoResponseFromServerTest - Changed expected bodies from 0 to 3.
Session created, session opened and session closed events generate exhanges
with null bodies.
commit 0efbbac82c6027536022c64a5aa68bee94d3ea94
Author: Chad Beaulac <cabeau...@gmail.com>
Date: 2013-02-10T20:03:26Z
CAMEL-2624 Mina2Consumer - Properly setting MINA2_SESSION_OPENED property
in exchange now.
Mina2TcpAsyncOutOnlyTest - Test the use case when a producer connects to a
consumer and then the consumer sends messages to the producer.
----
