You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2015/11/29 15:11:18 UTC
ignite git commit: Fixed performance suggestions.
Repository: ignite
Updated Branches:
refs/heads/ignite-1.5 923fea865 -> 0b61333a3
Fixed performance suggestions.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0b61333a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0b61333a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0b61333a
Branch: refs/heads/ignite-1.5
Commit: 0b61333a34be7fac8309ce050aa383f757f6187e
Parents: 923fea8
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Sun Nov 29 17:11:08 2015 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Sun Nov 29 17:11:08 2015 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0b61333a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 05b1997..87ccf93 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -1192,7 +1192,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
if (cfg.getIncludeEventTypes() != null && cfg.getIncludeEventTypes().length != 0)
perf.add("Disable grid events (remove 'includeEventTypes' from configuration)");
- if (BinaryMarshaller.available() && (cfg.getMarshaller() != null || !(cfg.getMarshaller() instanceof BinaryMarshaller)))
+ if (BinaryMarshaller.available() && (cfg.getMarshaller() != null && !(cfg.getMarshaller() instanceof BinaryMarshaller)))
perf.add("Use default binary marshaller (do not set 'marshaller' explicitly)");
}