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 9C8CD18CE3 for ; Thu, 10 Dec 2015 03:22:08 +0000 (UTC) Received: (qmail 75112 invoked by uid 500); 10 Dec 2015 03:22:08 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 74937 invoked by uid 500); 10 Dec 2015 03:22:08 -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 74763 invoked by uid 99); 10 Dec 2015 03:22:08 -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; Thu, 10 Dec 2015 03:22:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2FD97E0FE2; Thu, 10 Dec 2015 03:22:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.apache.org Date: Thu, 10 Dec 2015 03:22:17 -0000 Message-Id: <29fa3bfe6f624d0aa7d1e1ba4c85dac7@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [10/13] ignite git commit: 2064 Hotfix. 2064 Hotfix. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/637b79ad Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/637b79ad Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/637b79ad Branch: refs/heads/ignite-843-rc2 Commit: 637b79ad8902da082178e3e9cb63d80beb382a63 Parents: 6791c50 Author: Anton Vinogradov Authored: Wed Dec 9 18:18:52 2015 +0300 Committer: Anton Vinogradov Committed: Wed Dec 9 18:18:52 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/portable/PortableClassDescriptor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/637b79ad/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java index ed65e63..50c8bb5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java @@ -795,7 +795,7 @@ public class PortableClassDescriptor { * @return {@code true} if to use, {@code false} otherwise. */ private boolean initUseOptimizedMarshallerFlag() { - for (Class c = cls; !c.equals(Object.class); c = c.getSuperclass()) { + for (Class c = cls; c != null && !c.equals(Object.class); c = c.getSuperclass()) { try { Method writeObj = c.getDeclaredMethod("writeObject", ObjectOutputStream.class); Method readObj = c.getDeclaredMethod("readObject", ObjectInputStream.class);