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/add-contract-tests
Commit: 547b50a164234bb4454e24ec53e2cc6472c85e64
Parents: 44ece03
Author: Andy Seaborne <an...@apache.org>
Authored: Mon May 4 18:13:27 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
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 ) {