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 2018/07/30 16:03:12 UTC
[1/2] jena git commit: JENA-1580: Better error message when port in
use
Repository: jena
Updated Branches:
refs/heads/master fa77afdb8 -> 8be7fd625
JENA-1580: Better error message when port in use
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/fab78b8f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/fab78b8f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/fab78b8f
Branch: refs/heads/master
Commit: fab78b8fcda5372b202b9d0af387ec2fa862668e
Parents: fa77afd
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Jul 29 17:20:53 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Jul 29 17:24:50 2018 +0100
----------------------------------------------------------------------
.../org/apache/jena/fuseki/cmds/FusekiBasicCmd.java | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/fab78b8f/jena-fuseki2/jena-fuseki-basic/src/main/java/org/apache/jena/fuseki/cmds/FusekiBasicCmd.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-basic/src/main/java/org/apache/jena/fuseki/cmds/FusekiBasicCmd.java b/jena-fuseki2/jena-fuseki-basic/src/main/java/org/apache/jena/fuseki/cmds/FusekiBasicCmd.java
index 41f516f..f1680b6 100644
--- a/jena-fuseki2/jena-fuseki-basic/src/main/java/org/apache/jena/fuseki/cmds/FusekiBasicCmd.java
+++ b/jena-fuseki2/jena-fuseki-basic/src/main/java/org/apache/jena/fuseki/cmds/FusekiBasicCmd.java
@@ -18,6 +18,7 @@
package org.apache.jena.fuseki.cmds;
+import java.net.BindException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -36,6 +37,7 @@ import org.apache.jena.atlas.lib.DateTimeUtils ;
import org.apache.jena.atlas.lib.FileOps;
import org.apache.jena.atlas.logging.FmtLog;
import org.apache.jena.fuseki.Fuseki;
+import org.apache.jena.fuseki.FusekiException;
import org.apache.jena.fuseki.FusekiLogging;
import org.apache.jena.fuseki.embedded.FusekiServer;
import org.apache.jena.fuseki.server.DataAccessPoint;
@@ -403,7 +405,17 @@ public class FusekiBasicCmd {
try {
FusekiServer server = buildServer(serverConfig);
info(server, serverConfig);
- server.start();
+ try {
+ server.start();
+ } catch (FusekiException ex) {
+ if ( ex.getCause() instanceof BindException ) {
+ Fuseki.serverLog.error("Failed to start server: "+ex.getCause().getMessage()+ ": port="+serverConfig.port) ;
+ System.exit(1);
+ }
+ throw ex;
+ } catch (Exception ex) {
+ throw new FusekiException("Failed to start server: " + ex.getMessage(), ex) ;
+ }
server.join();
System.exit(0);
}
[2/2] jena git commit: JENA-1580: Merge commit 'refs/pull/452/head'
of https://github.com/apache/jena
Posted by an...@apache.org.
JENA-1580: Merge commit 'refs/pull/452/head' of https://github.com/apache/jena
This closes #452.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/8be7fd62
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/8be7fd62
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/8be7fd62
Branch: refs/heads/master
Commit: 8be7fd625170ded9a61650e81664832324ccf0a4
Parents: fa77afd fab78b8
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Jul 30 17:02:00 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Jul 30 17:02:00 2018 +0100
----------------------------------------------------------------------
.../org/apache/jena/fuseki/cmds/FusekiBasicCmd.java | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------