Merge branch 'master' into ignite-2745
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/091a39aa Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/091a39aa Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/091a39aa Branch: refs/heads/ignite-2745 Commit: 091a39aa582ca541621a7b04ea4f05cae17a7ce4 Parents: 6c51ace ee01b61 Author: vozerov-gridgain <[email protected]> Authored: Thu Mar 3 09:23:59 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Thu Mar 3 09:23:59 2016 +0300 ---------------------------------------------------------------------- .../internal/binary/BinaryEnumObjectImpl.java | 41 ++++- .../internal/processors/cache/CacheObject.java | 3 + .../binary/CacheObjectBinaryProcessorImpl.java | 3 +- .../dht/GridDhtPartitionTopologyImpl.java | 12 +- .../service/GridServiceProcessor.java | 2 +- .../processors/service/GridServiceProxy.java | 110 +++++++------ .../ignite/internal/util/IgniteUtils.java | 39 +++++ .../util/StripedCompositeReadWriteLock.java | 164 +++++++++++++++++++ .../internal/binary/BinaryEnumsSelfTest.java | 51 +++++- .../cache/CacheEnumOperationsAbstractTest.java | 32 ++++ ...idCacheReplicatedPreloadOffHeapSelfTest.java | 3 +- .../GridCacheReplicatedPreloadSelfTest.java | 16 +- .../GridServiceProxyNodeStopSelfTest.java | 105 ++++++++++++ .../processors/service/inner/MyService.java | 11 ++ .../processors/service/inner/MyServiceImpl.java | 10 ++ .../testsuites/IgniteKernalSelfTestSuite.java | 4 +- 16 files changed, 533 insertions(+), 73 deletions(-) ----------------------------------------------------------------------
