Merge remote-tracking branch 'remotes/origin/ignite-510' 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/12f0a8d2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/12f0a8d2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/12f0a8d2 Branch: refs/heads/ignite-409 Commit: 12f0a8d2ac7c479ff42470a31361f7961a1014b0 Parents: 9265672 839cfd0 Author: sboikov <sboi...@gridgain.com> Authored: Thu Mar 19 14:32:26 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Mar 19 14:32:26 2015 +0300 ---------------------------------------------------------------------- .../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(-) ----------------------------------------------------------------------
