Merge remote-tracking branch 'remotes/origin/ignite-sprint-6' into ignite-1009-v4
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cd43ff7c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cd43ff7c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cd43ff7c Branch: refs/heads/ignite-950 Commit: cd43ff7c4f9db4dc29572bd4dace4443b0373392 Parents: 7f97ec7 2707194 Author: sboikov <sboi...@gridgain.com> Authored: Fri Jun 12 18:28:23 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Jun 12 18:28:23 2015 +0300 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 12 +++ .../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, 464 insertions(+), 488 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd43ff7c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java ----------------------------------------------------------------------
