Return-Path: X-Original-To: apmail-beam-commits-archive@minotaur.apache.org Delivered-To: apmail-beam-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 083DA1883E for ; Wed, 20 Apr 2016 23:23:55 +0000 (UTC) Received: (qmail 59620 invoked by uid 500); 20 Apr 2016 23:23:55 -0000 Delivered-To: apmail-beam-commits-archive@beam.apache.org Received: (qmail 59558 invoked by uid 500); 20 Apr 2016 23:23:54 -0000 Mailing-List: contact commits-help@beam.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@beam.incubator.apache.org Delivered-To: mailing list commits@beam.incubator.apache.org Received: (qmail 59542 invoked by uid 99); 20 Apr 2016 23:23:54 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Apr 2016 23:23:54 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 6A021C0319 for ; Wed, 20 Apr 2016 23:23:54 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.221 X-Spam-Level: X-Spam-Status: No, score=-3.221 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id q71MdPom7ybP for ; Wed, 20 Apr 2016 23:23:53 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id EF0ED5F23E for ; Wed, 20 Apr 2016 23:23:52 +0000 (UTC) Received: (qmail 59524 invoked by uid 99); 20 Apr 2016 23:23:52 -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; Wed, 20 Apr 2016 23:23:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4B355DFB8E; Wed, 20 Apr 2016 23:23:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lcwik@apache.org To: commits@beam.incubator.apache.org Date: Wed, 20 Apr 2016 23:23:52 -0000 Message-Id: <0b2b5a1bd01349f78d90142d0383f9b8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] incubator-beam git commit: Thomas' comments Repository: incubator-beam Updated Branches: refs/heads/master 3e0eaf53e -> 4f8cb0344 Thomas' comments Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/4d8ef733 Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/4d8ef733 Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/4d8ef733 Branch: refs/heads/master Commit: 4d8ef73316171687c847c8b3b4aee0d6024ad852 Parents: 6334f72 Author: Mark Shields Authored: Wed Apr 20 15:59:31 2016 -0700 Committer: Luke Cwik Committed: Wed Apr 20 16:06:35 2016 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/beam/sdk/util/UserCodeException.java | 2 +- .../test/java/org/apache/beam/sdk/util/UserCodeExceptionTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/4d8ef733/sdks/java/core/src/main/java/org/apache/beam/sdk/util/UserCodeException.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/UserCodeException.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/UserCodeException.java index ba06961..ad1cd8b 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/UserCodeException.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/UserCodeException.java @@ -68,7 +68,7 @@ public class UserCodeException extends RuntimeException { int currentStackSize = currentStack.length; int throwableStackSize = throwableStack.length; - if (throwableStack.length == 0) { + if (throwableStackSize == 0) { // Nothing to truncate. return; } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/4d8ef733/sdks/java/core/src/test/java/org/apache/beam/sdk/util/UserCodeExceptionTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/util/UserCodeExceptionTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/util/UserCodeExceptionTest.java index 2c66d5b..3be1146 100644 --- a/sdks/java/core/src/test/java/org/apache/beam/sdk/util/UserCodeExceptionTest.java +++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/util/UserCodeExceptionTest.java @@ -100,7 +100,7 @@ public class UserCodeExceptionTest { public void robustAgainstEmptyStackTrace() { RuntimeException runtimeException = new RuntimeException("empty stack"); runtimeException.setStackTrace(new StackTraceElement[0]); - RuntimeException wrapped = UserCodeException.wrapIf(true, runtimeException); + RuntimeException wrapped = UserCodeException.wrap(runtimeException); assertEquals(runtimeException, wrapped.getCause()); }