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/10/24 17:05:04 UTC
[2/3] jena git commit: Remove unnecessary System.exit calls.
Remove unnecessary System.exit calls.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/2aedf71e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/2aedf71e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/2aedf71e
Branch: refs/heads/master
Commit: 2aedf71e2625190e021a92b3ea42150ac0734153
Parents: 38b22fe
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Oct 24 17:32:34 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Oct 24 17:32:34 2016 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/fuseki/FusekiCmd.java | 7 ++++++-
.../java/org/apache/jena/fuseki/server/SPARQLServer.java | 4 ++--
.../main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java | 11 ++++++++---
.../java/org/apache/jena/fuseki/jetty/JettyFuseki.java | 4 ++--
.../apache/jena/fuseki/server/FusekiServerListener.java | 3 ++-
.../jena/tdb/base/recordbuffer/RecordRangeIterator.java | 4 ++--
6 files changed, 22 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/2aedf71e/jena-fuseki1/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
----------------------------------------------------------------------
diff --git a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/FusekiCmd.java b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
index fb33ab7..c7f4085 100644
--- a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
+++ b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
@@ -483,7 +483,12 @@ public class FusekiCmd extends CmdARQ
{ serverLog.error("SPARQLServer: Failed to start management server: " + ex.getMessage(), ex) ; System.exit(1) ; }
}
- server.start() ;
+ try {
+ server.start() ;
+ } catch (FusekiException ex) {
+ serverLog.warn("Failed to start the server.", ex) ;
+ }
+
try { server.getServer().join() ; } catch (Exception ex) {}
if ( mgtServer != null )
http://git-wip-us.apache.org/repos/asf/jena/blob/2aedf71e/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java
----------------------------------------------------------------------
diff --git a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java
index 155f09f..2ab8db6 100644
--- a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java
+++ b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java
@@ -119,10 +119,10 @@ public class SPARQLServer {
server.start() ;
} catch (java.net.BindException ex) {
serverLog.error("SPARQLServer: Failed to start server: " + ex.getMessage()) ;
- System.exit(1) ;
+ throw new FusekiException("BindException: port="+server.getConnectors()[0].getPort()+": Failed to start server: " + ex.getMessage(), ex) ;
} catch (Exception ex) {
serverLog.error("SPARQLServer: Failed to start server: " + ex.getMessage(), ex) ;
- System.exit(1) ;
+ throw new FusekiException("Failed to start server: " + ex.getMessage(), ex) ;
}
ServletContextHandler context = (ServletContextHandler)server.getHandler() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/2aedf71e/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 4be63b8..04fcd70 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
@@ -25,8 +25,10 @@ import arq.cmdline.CmdARQ ;
import arq.cmdline.ModDatasetAssembler ;
import jena.cmd.ArgDecl ;
import jena.cmd.CmdException ;
+import jena.cmd.TerminationException;
import org.apache.jena.atlas.lib.FileOps ;
import org.apache.jena.fuseki.Fuseki ;
+import org.apache.jena.fuseki.FusekiException;
import org.apache.jena.fuseki.FusekiLogging ;
import org.apache.jena.fuseki.build.Template ;
import org.apache.jena.fuseki.jetty.JettyFuseki ;
@@ -338,7 +340,11 @@ public class FusekiCmd {
@Override
protected void exec() {
- runFuseki(cmdLineConfig, jettyServerConfig) ;
+ try {
+ runFuseki(cmdLineConfig, jettyServerConfig) ;
+ } catch (FusekiException ex) {
+ throw new TerminationException(1) ;
+ }
}
@Override
@@ -347,12 +353,11 @@ public class FusekiCmd {
}
}
- /** Configure and run a Fuseki server - this function does not return */
+ /** Configure and run a Fuseki server - this function does not return except for error starting up*/
public static void runFuseki(ServerInitialConfig serverConfig, JettyServerConfig jettyConfig) {
FusekiServerListener.initialSetup = serverConfig ;
JettyFuseki.initializeServer(jettyConfig) ;
JettyFuseki.instance.start() ;
JettyFuseki.instance.join() ;
- System.exit(0) ;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jena/blob/2aedf71e/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/JettyFuseki.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/JettyFuseki.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/JettyFuseki.java
index 00b6658..1c3670b 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/JettyFuseki.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/JettyFuseki.java
@@ -139,10 +139,10 @@ public class JettyFuseki {
server.start() ;
} catch (java.net.BindException ex) {
serverLog.error("SPARQLServer (port="+serverConnector.getPort()+"): Failed to start server: " + ex.getMessage()) ;
- System.exit(1) ;
+ throw new FusekiException("BindException: port="+serverConnector.getPort()+": Failed to start server: " + ex.getMessage(), ex) ;
} catch (Exception ex) {
serverLog.error("SPARQLServer: Failed to start server: " + ex.getMessage(), ex) ;
- System.exit(1) ;
+ throw new FusekiException("Failed to start server: " + ex.getMessage(), ex) ;
}
String now = DateTimeUtils.nowAsString() ;
serverLog.info(format("Started %s on port %d", now, serverConnector.getPort())) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/2aedf71e/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 6597fe8..4156134 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
@@ -23,6 +23,7 @@ import javax.servlet.ServletContextEvent ;
import javax.servlet.ServletContextListener ;
import org.apache.jena.fuseki.Fuseki ;
+import org.apache.jena.fuseki.FusekiException;
import org.apache.jena.tdb.StoreConnection ;
/** Setup configurtation.
@@ -88,7 +89,7 @@ public class FusekiServerListener implements ServletContextListener {
initialSetup, FusekiServer.dirConfiguration.toString()) ;
} else {
Fuseki.serverLog.error("No configuration") ;
- System.exit(0) ;
+ throw new FusekiException("No configuration") ;
}
} catch (Throwable th) {
Fuseki.serverLog.error("Exception in initialization: {}", th.getMessage()) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/2aedf71e/jena-tdb/src/main/java/org/apache/jena/tdb/base/recordbuffer/RecordRangeIterator.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/base/recordbuffer/RecordRangeIterator.java b/jena-tdb/src/main/java/org/apache/jena/tdb/base/recordbuffer/RecordRangeIterator.java
index cdbc390..f577a57 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/base/recordbuffer/RecordRangeIterator.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/base/recordbuffer/RecordRangeIterator.java
@@ -24,6 +24,7 @@ import java.util.Iterator;
import java.util.NoSuchElementException;
import org.apache.jena.atlas.lib.Closeable ;
+import org.apache.jena.atlas.logging.Log;
import org.apache.jena.tdb.base.StorageException ;
import org.apache.jena.tdb.base.block.BlockException ;
import org.apache.jena.tdb.base.record.Record ;
@@ -36,8 +37,7 @@ class RecordRangeIterator implements Iterator<Record>, Closeable
{
if ( ! pageMgr.valid(pageId) ) {
String msg = "RecordRangeIterator.iterator -- No such block (pageId="+pageId+", fromRec="+fromRec+", toRec="+toRec+ ")" ;
- System.err.println(msg) ;
- System.exit(0) ;
+ Log.fatal(RecordRangeIterator.class, msg);
throw new BlockException(msg) ;
}
return new RecordRangeIterator(pageId, fromRec, toRec, pageMgr) ;