Merge branches 'ignite-330' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-330
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/85f02911 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/85f02911 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/85f02911 Branch: refs/heads/ignite-330 Commit: 85f02911c30e96b6c3b1a0183addaa90e619c2e7 Parents: 2a91713 12f0a8d Author: AKuznetsov <akuznet...@gridgain.com> Authored: Thu Mar 19 21:09:26 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Thu Mar 19 21:09:26 2015 +0700 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteKernal.java | 2 +- .../deployment/GridDeploymentLocalStore.java | 5 +- .../GridDeploymentPerLoaderStore.java | 5 +- .../GridDeploymentPerVersionStore.java | 5 +- .../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 +- 13 files changed, 108 insertions(+), 69 deletions(-) ----------------------------------------------------------------------
