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 ED2AC200B7C for ; Thu, 8 Sep 2016 17:28:25 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id EBD44160AD5; Thu, 8 Sep 2016 15:28:25 +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 E2249160ADB for ; Thu, 8 Sep 2016 17:28:24 +0200 (CEST) Received: (qmail 31891 invoked by uid 500); 8 Sep 2016 15:28:24 -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 31679 invoked by uid 99); 8 Sep 2016 15:28:23 -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, 08 Sep 2016 15:28:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B44ACEF79F; Thu, 8 Sep 2016 15:28:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: trohrmann@apache.org To: commits@flink.apache.org Date: Thu, 08 Sep 2016 15:28:34 -0000 Message-Id: <41d9e47d297749d79cfc972abb8cbe6d@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [12/50] [abbrv] flink git commit: [FLINK-4436] Unclosed DataOutputBuffer in Utils#setTokensFor() archived-at: Thu, 08 Sep 2016 15:28:26 -0000 [FLINK-4436] Unclosed DataOutputBuffer in Utils#setTokensFor() This closes #2402 Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/7e07bde8 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/7e07bde8 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/7e07bde8 Branch: refs/heads/flip-6 Commit: 7e07bde8c5b33e9985260416fdf75e15df102efa Parents: 66d4b87 Author: f7753 Authored: Mon Aug 22 21:07:55 2016 +0800 Committer: zentol Committed: Thu Sep 8 12:04:25 2016 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/flink/yarn/Utils.java | 15 ++++++++------- .../flink/yarn/YarnApplicationMasterRunner.java | 3 +-- 2 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/7e07bde8/flink-yarn/src/main/java/org/apache/flink/yarn/Utils.java ---------------------------------------------------------------------- diff --git a/flink-yarn/src/main/java/org/apache/flink/yarn/Utils.java b/flink-yarn/src/main/java/org/apache/flink/yarn/Utils.java index d5bad2f..1496d61 100644 --- a/flink-yarn/src/main/java/org/apache/flink/yarn/Utils.java +++ b/flink-yarn/src/main/java/org/apache/flink/yarn/Utils.java @@ -155,15 +155,16 @@ public final class Utils { LOG.info("Adding user token " + id + " with " + token); credentials.addToken(id, token); } - DataOutputBuffer dob = new DataOutputBuffer(); - credentials.writeTokenStorageToStream(dob); + try (DataOutputBuffer dob = new DataOutputBuffer()) { + credentials.writeTokenStorageToStream(dob); - if(LOG.isDebugEnabled()) { - LOG.debug("Wrote tokens. Credentials buffer length: " + dob.getLength()); - } + if(LOG.isDebugEnabled()) { + LOG.debug("Wrote tokens. Credentials buffer length: " + dob.getLength()); + } - ByteBuffer securityTokens = ByteBuffer.wrap(dob.getData(), 0, dob.getLength()); - amContainer.setTokens(securityTokens); + ByteBuffer securityTokens = ByteBuffer.wrap(dob.getData(), 0, dob.getLength()); + amContainer.setTokens(securityTokens); + } } /** http://git-wip-us.apache.org/repos/asf/flink/blob/7e07bde8/flink-yarn/src/main/java/org/apache/flink/yarn/YarnApplicationMasterRunner.java ---------------------------------------------------------------------- diff --git a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnApplicationMasterRunner.java b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnApplicationMasterRunner.java index 4637b97..7453344 100644 --- a/flink-yarn/src/main/java/org/apache/flink/yarn/YarnApplicationMasterRunner.java +++ b/flink-yarn/src/main/java/org/apache/flink/yarn/YarnApplicationMasterRunner.java @@ -599,10 +599,9 @@ public class YarnApplicationMasterRunner { ctx.setEnvironment(containerEnv); - try { + try (DataOutputBuffer dob = new DataOutputBuffer()) { UserGroupInformation user = UserGroupInformation.getCurrentUser(); Credentials credentials = user.getCredentials(); - DataOutputBuffer dob = new DataOutputBuffer(); credentials.writeTokenStorageToStream(dob); ByteBuffer securityTokens = ByteBuffer.wrap(dob.getData(), 0, dob.getLength()); ctx.setTokens(securityTokens);