You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/02/20 12:34:17 UTC
[1/2] ignite git commit: IGNITE-2683 In indexing kernal context can
be null in tests.
Repository: ignite
Updated Branches:
refs/heads/ignite-1.5.7 80dd057a0 -> b8beea91e
IGNITE-2683 In indexing kernal context can be null in tests.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3172b4d7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3172b4d7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3172b4d7
Branch: refs/heads/ignite-1.5.7
Commit: 3172b4d7f022a1bb6f54f2daa9e62fbb432e7647
Parents: 03e5d9c
Author: sboikov <sb...@gridgain.com>
Authored: Sat Feb 20 14:33:45 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Sat Feb 20 14:33:45 2016 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/query/h2/IgniteH2Indexing.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3172b4d7/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 5dd1089..cae1a9f 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -1501,7 +1501,9 @@ public class IgniteH2Indexing implements GridQueryIndexing {
}
@Override public Object deserialize(byte[] bytes) throws Exception {
- return marshaller.unmarshal(bytes, U.resolveClassLoader(ctx.config()));
+ ClassLoader clsLdr = ctx != null ? U.resolveClassLoader(ctx.config()) : null;
+
+ return marshaller.unmarshal(bytes, clsLdr);
}
};
}
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-1.5.7' into ignite-1.5.7
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.5.7' into ignite-1.5.7
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b8beea91
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b8beea91
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b8beea91
Branch: refs/heads/ignite-1.5.7
Commit: b8beea91eede6bb89b005aa7e945112d4db993c6
Parents: 3172b4d 80dd057
Author: sboikov <sb...@gridgain.com>
Authored: Sat Feb 20 14:34:12 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Sat Feb 20 14:34:12 2016 +0300
----------------------------------------------------------------------
.../datastreamer/DataStreamerImpl.java | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------