Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8A64B200C8F for ; Fri, 9 Jun 2017 15:13:17 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 89086160BC8; Fri, 9 Jun 2017 13:13:17 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D03A2160B9C for ; Fri, 9 Jun 2017 15:13:16 +0200 (CEST) Received: (qmail 56119 invoked by uid 500); 9 Jun 2017 13:13:16 -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 56110 invoked by uid 99); 9 Jun 2017 13:13:16 -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; Fri, 09 Jun 2017 13:13:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E5721DFA0A; Fri, 9 Jun 2017 13:13:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: IGNITE-5459: Deprecated IgniteConfiguration.marshaller property. Date: Fri, 9 Jun 2017 13:13:15 +0000 (UTC) archived-at: Fri, 09 Jun 2017 13:13:17 -0000 Repository: ignite Updated Branches: refs/heads/master 03ec10757 -> 39c5b5db2 IGNITE-5459: Deprecated IgniteConfiguration.marshaller property. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/39c5b5db Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/39c5b5db Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/39c5b5db Branch: refs/heads/master Commit: 39c5b5db250a48437baf4bcb8df0dc1c029cbed8 Parents: 03ec107 Author: devozerov Authored: Fri Jun 9 16:13:09 2017 +0300 Committer: devozerov Committed: Fri Jun 9 16:13:09 2017 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/configuration/IgniteConfiguration.java | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/39c5b5db/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java index 8e531e2..76073c9 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java @@ -1179,7 +1179,10 @@ public class IgniteConfiguration { * without deserialization will be used. * * @return Marshaller to use in grid. + * @deprecated Since 2.1. Some Ignite features will not work if non-null marshaller is set + * (IgniteCache.withKeepBinary(), .NET, CPP, ODBC) */ + @Deprecated public Marshaller getMarshaller() { return marsh; } @@ -1190,7 +1193,10 @@ public class IgniteConfiguration { * @param marsh Marshaller to use within grid. * @see IgniteConfiguration#getMarshaller() * @return {@code this} for chaining. + * @deprecated Since 2.1. Some Ignite features will not work if non-null marshaller is set + * (IgniteCache.withKeepBinary(), .NET, CPP, ODBC) */ + @Deprecated public IgniteConfiguration setMarshaller(Marshaller marsh) { this.marsh = marsh;