Merge branch 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-484-1
# Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d8825fd7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d8825fd7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d8825fd7 Branch: refs/heads/ignite-484-1 Commit: d8825fd71e55f285e62bb958357c3a5581607a4d Parents: 4a53405 5160088 Author: S.Vladykin <svlady...@gridgain.com> Authored: Fri Jun 12 17:24:12 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Fri Jun 12 17:24:12 2015 +0300 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 10 +++ .../ignite/internal/GridKernalContextImpl.java | 5 +- .../apache/ignite/internal/IgniteKernal.java | 21 +++++- .../internal/MarshallerContextAdapter.java | 18 ++++- .../ignite/internal/MarshallerContextImpl.java | 14 +++- .../GridClientOptimizedMarshaller.java | 5 ++ .../distributed/GridCacheTxRecoveryRequest.java | 26 +++---- .../GridCacheTxRecoveryResponse.java | 14 ++-- .../distributed/GridDistributedBaseMessage.java | 77 +------------------- .../distributed/GridDistributedLockRequest.java | 54 +++++++------- .../GridDistributedLockResponse.java | 14 ++-- .../GridDistributedTxFinishRequest.java | 46 ++++++------ .../GridDistributedTxPrepareRequest.java | 62 ++++++++-------- .../GridDistributedTxPrepareResponse.java | 64 +--------------- .../GridDistributedUnlockRequest.java | 6 +- .../distributed/dht/GridDhtLockRequest.java | 72 ++++++++++++++---- .../distributed/dht/GridDhtLockResponse.java | 18 ++--- .../distributed/dht/GridDhtTxFinishRequest.java | 38 +++++----- .../dht/GridDhtTxPrepareRequest.java | 54 +++++++------- .../dht/GridDhtTxPrepareResponse.java | 22 +++--- .../distributed/dht/GridDhtUnlockRequest.java | 6 +- .../distributed/near/GridNearLockRequest.java | 58 +++++++-------- .../distributed/near/GridNearLockResponse.java | 26 +++---- .../near/GridNearTxFinishRequest.java | 26 +++---- .../near/GridNearTxPrepareRequest.java | 50 ++++++------- .../near/GridNearTxPrepareResponse.java | 46 ++++++------ .../distributed/near/GridNearUnlockRequest.java | 2 +- .../cache/transactions/IgniteTxHandler.java | 3 - .../plugin/IgnitePluginProcessor.java | 16 +--- .../messages/GridQueryNextPageResponse.java | 1 + .../cache/GridCachePutAllFailoverSelfTest.java | 5 -- .../IgniteCacheP2pUnmarshallingTxErrorTest.java | 14 +++- .../dht/GridCacheColocatedFailoverSelfTest.java | 5 -- .../GridCachePartitionedFailoverSelfTest.java | 5 -- .../GridCacheReplicatedFailoverSelfTest.java | 5 -- .../DataStreamProcessorSelfTest.java | 3 +- .../marshaller/MarshallerContextTestImpl.java | 18 +++++ .../junits/GridTestKernalContext.java | 1 + .../testsuites/IgniteKernalSelfTestSuite.java | 2 +- .../ignite/tools/classgen/ClassesGenerator.java | 18 ++++- 40 files changed, 462 insertions(+), 488 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d8825fd7/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java index b881f93,b210625..0f62ae9 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java @@@ -191,11 -187,6 +191,12 @@@ public class GridQueryNextPageResponse writer.incrementState(); + case 6: + if (!writer.writeMessage("retry", retry)) + return false; + + writer.incrementState(); ++ } return true;
