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 3220F200B6B for ; Fri, 9 Sep 2016 12:17:55 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2DED1160AC2; Fri, 9 Sep 2016 10:17:55 +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 76509160AB6 for ; Fri, 9 Sep 2016 12:17:54 +0200 (CEST) Received: (qmail 81415 invoked by uid 500); 9 Sep 2016 10:17:53 -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 81406 invoked by uid 99); 9 Sep 2016 10:17:53 -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 Sep 2016 10:17:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7A7A4DFF58; Fri, 9 Sep 2016 10:17:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: twalthr@apache.org To: commits@flink.apache.org Message-Id: <7c472d05ce5748fcb05cd6baf92a8dbd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: flink git commit: [FLINK-4601] [java] Check for empty string properly Date: Fri, 9 Sep 2016 10:17:53 +0000 (UTC) archived-at: Fri, 09 Sep 2016 10:17:55 -0000 Repository: flink Updated Branches: refs/heads/master 95b673f0b -> e92f91aeb [FLINK-4601] [java] Check for empty string properly This closes #2483. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/e92f91ae Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/e92f91ae Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/e92f91ae Branch: refs/heads/master Commit: e92f91aeba3c9e8da5a5ff9efda342cb19da928c Parents: 95b673f Author: Alexander Pivovarov Authored: Thu Sep 8 23:58:45 2016 -0700 Committer: twalthr Committed: Fri Sep 9 12:16:18 2016 +0200 ---------------------------------------------------------------------- .../org/apache/flink/api/java/sca/UdfAnalyzerExamplesTest.java | 2 +- .../test/java/org/apache/flink/api/java/sca/UdfAnalyzerTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/e92f91ae/flink-java/src/test/java/org/apache/flink/api/java/sca/UdfAnalyzerExamplesTest.java ---------------------------------------------------------------------- diff --git a/flink-java/src/test/java/org/apache/flink/api/java/sca/UdfAnalyzerExamplesTest.java b/flink-java/src/test/java/org/apache/flink/api/java/sca/UdfAnalyzerExamplesTest.java index 5254b68..11ab5f2 100644 --- a/flink-java/src/test/java/org/apache/flink/api/java/sca/UdfAnalyzerExamplesTest.java +++ b/flink-java/src/test/java/org/apache/flink/api/java/sca/UdfAnalyzerExamplesTest.java @@ -548,7 +548,7 @@ public class UdfAnalyzerExamplesTest { if (i == 42 - 1) { p.setLabel(new Integer(split[i].trim().substring(0, 1))); } else { - if (a < 42 && split[i].trim() != "") { + if (a < 42 && !split[i].trim().isEmpty()) { features[a++] = Double.parseDouble(split[i].trim()); } } http://git-wip-us.apache.org/repos/asf/flink/blob/e92f91ae/flink-java/src/test/java/org/apache/flink/api/java/sca/UdfAnalyzerTest.java ---------------------------------------------------------------------- diff --git a/flink-java/src/test/java/org/apache/flink/api/java/sca/UdfAnalyzerTest.java b/flink-java/src/test/java/org/apache/flink/api/java/sca/UdfAnalyzerTest.java index dc2d1db..20ce261 100644 --- a/flink-java/src/test/java/org/apache/flink/api/java/sca/UdfAnalyzerTest.java +++ b/flink-java/src/test/java/org/apache/flink/api/java/sca/UdfAnalyzerTest.java @@ -1101,7 +1101,7 @@ public class UdfAnalyzerTest { public static class Reduce2 implements ReduceFunction { @Override public MyPojo reduce(MyPojo value1, MyPojo value2) throws Exception { - if (value1.field == "") { + if (value1.field != null && value1.field.isEmpty()) { return value2; } return value1;