Return-Path: X-Original-To: apmail-jena-commits-archive@www.apache.org Delivered-To: apmail-jena-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A406517AD5 for ; Mon, 4 May 2015 17:15:00 +0000 (UTC) Received: (qmail 44771 invoked by uid 500); 4 May 2015 17:15:00 -0000 Delivered-To: apmail-jena-commits-archive@jena.apache.org Received: (qmail 44710 invoked by uid 500); 4 May 2015 17:15:00 -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 44658 invoked by uid 99); 4 May 2015 17:15:00 -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, 04 May 2015 17:15:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4637FE095C; Mon, 4 May 2015 17:15:00 +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, 04 May 2015 17:15:02 -0000 Message-Id: <8c6f6f9d5e594c1e9dc3d9f4f637b079@git.apache.org> In-Reply-To: <6b55f6486e4c4fa4b5ad30dbf0c55cf8@git.apache.org> References: <6b55f6486e4c4fa4b5ad30dbf0c55cf8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] jena git commit: Don't expect service name when config file given Don't expect service name when config file given Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/547b50a1 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/547b50a1 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/547b50a1 Branch: refs/heads/master Commit: 547b50a164234bb4454e24ec53e2cc6472c85e64 Parents: 44ece03 Author: Andy Seaborne Authored: Mon May 4 18:13:27 2015 +0100 Committer: Andy Seaborne Committed: Mon May 4 18:13:27 2015 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/547b50a1/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java index 3d91de4..5da6b07 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java @@ -185,7 +185,7 @@ public class FusekiCmd { throw new CmdException("Multiple ways providing a dataset. Only one of --mem, --file, --loc or --desc") ; } - boolean configPresent = ( x != 0 ) || ( cmdLineDataset.fusekiConfigFile != null ) ; + boolean cmdlineConfigPresent = ( x != 0 ) ; if ( contains(argMem) ) { log.info("Dataset: in-memory") ; @@ -232,9 +232,9 @@ public class FusekiCmd { //cmdLineDataset.dsg = ds.asDatasetGraph() ; } - if ( configPresent && getPositional().size() == 0 ) + if ( cmdlineConfigPresent && getPositional().size() == 0 ) throw new CmdException("Missing service name") ; - if ( !configPresent && getPositional().size() > 0 ) + if ( !cmdlineConfigPresent && getPositional().size() > 0 ) throw new CmdException("Service name given but no configuration argument to match") ; if ( cmdLineDataset != null ) {