/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*/
package jalview.httpserver;
+import jalview.bin.Instance;
import jalview.rest.RestHandler;
import java.net.BindException;
*/
public class HttpServer
{
- /*
- * 'context root' - actually just prefixed to the path for each handler for
- * now - see registerHandler
- */
- private static final String JALVIEW_PATH = "jalview";
-
- /*
- * Singleton instance of this server
- */
- private static HttpServer instance;
-
- /*
- * The Http server
- */
- private Server server;
-
- /*
- * Registered handlers for context paths
- */
- private HandlerCollection contextHandlers;
-
- /*
- * Lookup of ContextHandler by its wrapped handler
- */
- Map<Handler, ContextHandler> myHandlers = new HashMap<Handler, ContextHandler>();
-
- /*
- * The context root for the server
- */
- private URI contextRoot;
/**
* Returns the singleton instance of this class.
{
synchronized (HttpServer.class)
{
- if (instance == null)
- {
- instance = new HttpServer();
- }
- return instance;
+ Instance j = Instance.getInstance();
+ return (j.httpServer == null ? j.httpServer = new HttpServer()
+ : j.httpServer);
}
}
/**
- * Private constructor to enforce use of singleton
+ * Private constructor to enforce use of singleton; use getInstance().
*
* @throws BindException
* if no free port can be assigned
*/
private HttpServer() throws BindException
{
+ // use getInstance()
+
startServer();
/*
registerHandler(RestHandler.getInstance());
}
+ /*
+ * 'context root' - actually just prefixed to the path for each handler for
+ * now - see registerHandler
+ */
+ private static final String JALVIEW_PATH = "jalview";
+
+ /*
+ * The Http server
+ */
+ private Server server;
+
+ /*
+ * Registered handlers for context paths
+ */
+ private HandlerCollection contextHandlers;
+
+ /*
+ * Lookup of ContextHandler by its wrapped handler
+ */
+ Map<Handler, ContextHandler> myHandlers = new HashMap<>();
+
+ /*
+ * The context root for the server
+ */
+ private URI contextRoot;
+
/**
* Start the http server
*
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();
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));