You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2016/02/19 21:33:34 UTC
[8/9] jena git commit: Use run/config.ttl if the command line did not
give one.
Use run/config.ttl if the command line did not give one.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/8b4dd0c9
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/8b4dd0c9
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/8b4dd0c9
Branch: refs/heads/master
Commit: 8b4dd0c927e18d1f7148f54ac033cab9ab9c6231
Parents: ef85f9b
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Feb 19 19:08:57 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Feb 19 19:08:57 2016 +0000
----------------------------------------------------------------------
.../apache/jena/fuseki/server/FusekiServerListener.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/8b4dd0c9/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiServerListener.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiServerListener.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiServerListener.java
index 0cc6532..39bbf4a 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiServerListener.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiServerListener.java
@@ -66,10 +66,14 @@ public class FusekiServerListener implements ServletContextListener {
Fuseki.serverLog.error("Failed to initialize : Server not running") ;
return ;
}
- // The command line code sets initialSetup. In a non-commandline startup,
- // initialSetup is null. Set to include a possible config.ttl in the BASE area.
- if ( initialSetup == null ) {
+
+ // The command line code sets initialSetup.
+ // In a non-commandline startup, initialSetup is null.
+ if ( initialSetup == null )
initialSetup = new ServerInitialConfig() ;
+
+ if ( initialSetup.fusekiCmdLineConfigFile == null ) {
+ // If not command line configuration file, use the run area one.
String cfg = FusekiEnv.FUSEKI_BASE.resolve(FusekiServer.DFT_CONFIG).toAbsolutePath().toString() ;
initialSetup.fusekiServerConfigFile = cfg ;
}