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 46839200B16 for ; Mon, 20 Jun 2016 10:34:29 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 456B7160A66; Mon, 20 Jun 2016 08:34:29 +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 98190160A24 for ; Mon, 20 Jun 2016 10:34:28 +0200 (CEST) Received: (qmail 10061 invoked by uid 500); 20 Jun 2016 08:34:27 -0000 Mailing-List: contact commits-help@jena.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jena.apache.org Delivered-To: mailing list commits@jena.apache.org Received: (qmail 10043 invoked by uid 99); 20 Jun 2016 08:34:27 -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; Mon, 20 Jun 2016 08:34:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9C612ED30B; Mon, 20 Jun 2016 08:34:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: andy@apache.org To: commits@jena.apache.org Date: Mon, 20 Jun 2016 08:34:27 -0000 Message-Id: <11e23bc648a94a2db2c37454d730056d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] jena git commit: Always set the error handler to something non-null. archived-at: Mon, 20 Jun 2016 08:34:29 -0000 Repository: jena Updated Branches: refs/heads/master e1bb3c967 -> 646c910fd Always set the error handler to something non-null. Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b43dfcfb Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b43dfcfb Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b43dfcfb Branch: refs/heads/master Commit: b43dfcfb1132deecf0b3e8ff12362ae0700505f9 Parents: e1bb3c9 Author: Andy Seaborne Authored: Fri Jun 17 09:49:48 2016 +0100 Committer: Andy Seaborne Committed: Fri Jun 17 09:49:48 2016 +0100 ---------------------------------------------------------------------- jena-cmds/src/main/java/riotcmd/CmdLangParse.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/b43dfcfb/jena-cmds/src/main/java/riotcmd/CmdLangParse.java ---------------------------------------------------------------------- diff --git a/jena-cmds/src/main/java/riotcmd/CmdLangParse.java b/jena-cmds/src/main/java/riotcmd/CmdLangParse.java index 080edd7..67571d8 100644 --- a/jena-cmds/src/main/java/riotcmd/CmdLangParse.java +++ b/jena-cmds/src/main/java/riotcmd/CmdLangParse.java @@ -213,9 +213,8 @@ public abstract class CmdLangParse extends CmdGeneral if ( modLangParse.explicitChecking() ) checking = true ; if ( modLangParse.explicitNoChecking() ) checking = false ; - ErrorHandler errHandler = null ; - if ( checking ) - { + ErrorHandler errHandler = ErrorHandlerFactory.errorHandlerWarn ; + if ( checking ) { if ( modLangParse.stopOnBadTerm() ) errHandler = ErrorHandlerFactory.errorHandlerStd ; else @@ -223,8 +222,7 @@ public abstract class CmdLangParse extends CmdGeneral errHandler = ErrorHandlerFactory.errorHandlerWarn ; } - if ( modLangParse.skipOnBadTerm() ) - { + if ( modLangParse.skipOnBadTerm() ) { // TODO skipOnBadterm } @@ -240,10 +238,8 @@ public abstract class CmdLangParse extends CmdGeneral // If multiple files, choose the overall labels. if ( langHandlerOverall == null ) langHandlerOverall = handler ; - else - { - if ( langHandlerOverall != langHandlerAny ) - { + else { + if ( langHandlerOverall != langHandlerAny ) { if ( langHandlerOverall != handler ) langHandlerOverall = langHandlerAny ; }