git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into merge/JAL-3978+JAL-3553+develop+JAL-3989
[jalview.git]
/
src
/
jalview
/
httpserver
/
HttpServer.java
diff --git
a/src/jalview/httpserver/HttpServer.java
b/src/jalview/httpserver/HttpServer.java
index
134123b
..
a18d38d
100644
(file)
--- a/
src/jalview/httpserver/HttpServer.java
+++ b/
src/jalview/httpserver/HttpServer.java
@@
-156,8
+156,8
@@
public class HttpServer
contextRoot = server.getURI();
} catch (Exception e)
{
contextRoot = server.getURI();
} catch (Exception e)
{
- System.err.println("Error trying to start HttpServer: "
- + e.getMessage());
+ System.err.println(
+ "Error trying to start HttpServer: " + e.getMessage());
try
{
server.stop();
try
{
server.stop();
@@
-267,8
+267,8
@@
public class HttpServer
ch.start();
} catch (Exception e)
{
ch.start();
} catch (Exception e)
{
- System.err.println("Error starting handler for " + path + ": "
- + e.getMessage());
+ System.err.println(
+ "Error starting handler for " + path + ": " + e.getMessage());
}
handler.setUri(this.contextRoot + ch.getContextPath().substring(1));
}
handler.setUri(this.contextRoot + ch.getContextPath().substring(1));