Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B8CDF184D5 for ; Tue, 1 Dec 2015 09:02:14 +0000 (UTC) Received: (qmail 70492 invoked by uid 500); 1 Dec 2015 09:02:14 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 70337 invoked by uid 500); 1 Dec 2015 09:02:14 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 69914 invoked by uid 99); 1 Dec 2015 09:02:14 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Dec 2015 09:02:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 60760E0E4C; Tue, 1 Dec 2015 09:02:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anovikov@apache.org To: commits@ignite.apache.org Date: Tue, 01 Dec 2015 09:02:41 -0000 Message-Id: In-Reply-To: <9eb181567f2f4a45808ea30cc51a72f5@git.apache.org> References: <9eb181567f2f4a45808ea30cc51a72f5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [29/50] [abbrv] ignite git commit: Fixed performance suggestions. 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-843-rc2 Commit: 0b61333a34be7fac8309ce050aa383f757f6187e Parents: 923fea8 Author: Alexey Goncharuk Authored: Sun Nov 29 17:11:08 2015 +0300 Committer: Alexey Goncharuk 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)"); }