X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Frest%2FRestHandler.java;h=a37882f83e468d4d9e0090191ff9ffdd8e71c329;hb=4f77328104498504339216829abf5ea87e2791ec;hp=7c8c9a6cefdef63f94db95e7704f4385ca1ba0da;hpb=2b8c0785318a3528e1876e8e2dd48b7d831eae69;p=jalview.git

diff --git a/src/jalview/rest/RestHandler.java b/src/jalview/rest/RestHandler.java
index 7c8c9a6..a37882f 100644
--- a/src/jalview/rest/RestHandler.java
+++ b/src/jalview/rest/RestHandler.java
@@ -20,8 +20,6 @@
  */
 package jalview.rest;
 
-import jalview.bin.ApplicationSingletonProvider;
-import jalview.bin.ApplicationSingletonProvider.ApplicationSingletonI;
 import jalview.httpserver.AbstractRequestHandler;
 
 import java.io.IOException;
@@ -32,16 +30,20 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
- * A simple handler to process (or delegate) HTTP requests on /jalview/rest.
+ * A simple handler to process (or delegate) HTTP requests on /jalview/rest
  */
 public class RestHandler extends AbstractRequestHandler
-        implements ApplicationSingletonI
 {
   private static final String MY_PATH = "rest";
 
   private static final String MY_NAME = "Rest";
 
   /**
+   * Singleton instance of this class
+   */
+  private static RestHandler instance = null;
+
+  /**
    * Returns the singleton instance of this class
    * 
    * @return
@@ -51,8 +53,12 @@ public class RestHandler extends AbstractRequestHandler
   {
     synchronized (RestHandler.class)
     {
-      return (RestHandler) ApplicationSingletonProvider.getInstance(RestHandler.class);
+      if (instance == null)
+      {
+        instance = new RestHandler();
+      }
     }
+    return instance;
   }
 
   /**