Return-Path: X-Original-To: apmail-flink-commits-archive@minotaur.apache.org Delivered-To: apmail-flink-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 E8D6A187C0 for ; Fri, 15 Jan 2016 13:26:58 +0000 (UTC) Received: (qmail 92135 invoked by uid 500); 15 Jan 2016 13:26:58 -0000 Delivered-To: apmail-flink-commits-archive@flink.apache.org Received: (qmail 92086 invoked by uid 500); 15 Jan 2016 13:26:58 -0000 Mailing-List: contact commits-help@flink.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flink.apache.org Delivered-To: mailing list commits@flink.apache.org Received: (qmail 92077 invoked by uid 99); 15 Jan 2016 13:26:58 -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, 15 Jan 2016 13:26:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id ADD1CE07D9; Fri, 15 Jan 2016 13:26:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sewen@apache.org To: commits@flink.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: flink git commit: [hotfix] Use AccumulatorSnapshot's class loader for deserializing accumulators Date: Fri, 15 Jan 2016 13:26:58 +0000 (UTC) Repository: flink Updated Branches: refs/heads/master 2c556f74e -> cfcb5d7ba [hotfix] Use AccumulatorSnapshot's class loader for deserializing accumulators This closes #1511 Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/cfcb5d7b Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/cfcb5d7b Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/cfcb5d7b Branch: refs/heads/master Commit: cfcb5d7ba5c22295c0ae628f8d9a2447e2286985 Parents: 2c556f7 Author: Prez Cannady Authored: Thu Jan 14 18:58:41 2016 -0500 Committer: Stephan Ewen Committed: Fri Jan 15 12:23:42 2016 +0100 ---------------------------------------------------------------------- .../org/apache/flink/runtime/accumulators/AccumulatorSnapshot.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/cfcb5d7b/flink-runtime/src/main/java/org/apache/flink/runtime/accumulators/AccumulatorSnapshot.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/accumulators/AccumulatorSnapshot.java b/flink-runtime/src/main/java/org/apache/flink/runtime/accumulators/AccumulatorSnapshot.java index b813153..d0f4bad 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/accumulators/AccumulatorSnapshot.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/accumulators/AccumulatorSnapshot.java @@ -71,7 +71,7 @@ public class AccumulatorSnapshot implements Serializable { * @return the serialized map */ public Map> deserializeFlinkAccumulators() throws IOException, ClassNotFoundException { - return flinkAccumulators.deserializeValue(ClassLoader.getSystemClassLoader()); + return flinkAccumulators.deserializeValue(getClass().getClassLoader()); } /**