Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d6fdf05f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d6fdf05f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d6fdf05f Branch: refs/heads/ignite-gg-9933 Commit: d6fdf05f1c04b21f9be964bd587d41f26c0bf0b5 Parents: 48b41f2 12f0a8d Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Thu Mar 19 17:15:33 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Thu Mar 19 17:15:33 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteKernal.java | 2 +- .../deployment/GridDeploymentLocalStore.java | 5 +- .../GridDeploymentPerLoaderStore.java | 5 +- .../GridDeploymentPerVersionStore.java | 5 +- .../continuous/CacheContinuousQueryHandler.java | 3 -- .../continuous/CacheContinuousQueryManager.java | 4 -- .../optimized/OptimizedClassDescriptor.java | 20 ++++++-- .../optimized/OptimizedMarshaller.java | 30 +++++++----- .../optimized/OptimizedMarshallerUtils.java | 50 +++++++------------- .../optimized/OptimizedObjectInputStream.java | 20 ++++++-- .../optimized/OptimizedObjectOutputStream.java | 22 +++++++-- .../processors/service/DummyService.java | 4 ++ .../optimized/OptimizedMarshallerTest.java | 4 +- .../OptimizedObjectStreamSelfTest.java | 8 +++- .../testframework/junits/GridAbstractTest.java | 2 +- .../config/benchmark-multicast.properties | 2 +- 16 files changed, 109 insertions(+), 77 deletions(-) ----------------------------------------------------------------------
