From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 3 Apr 2017 11:56:53 +0000 (+0100)
Subject: Merge branch 'develop' into bug/JAL-2461
X-Git-Tag: Release_2_10_2~3^2~140^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=71b7dc2dbc920391e3209bde9e915dd3436871f3;hp=f5c4a8a268a77ac474addbc778e85b75ffa05da3;p=jalview.git

Merge branch 'develop' into bug/JAL-2461
---

diff --git a/src/jalview/ws/dbsources/das/datamodel/DasSourceRegistry.java b/src/jalview/ws/dbsources/das/datamodel/DasSourceRegistry.java
index b184ff2..e0f7f70 100644
--- a/src/jalview/ws/dbsources/das/datamodel/DasSourceRegistry.java
+++ b/src/jalview/ws/dbsources/das/datamodel/DasSourceRegistry.java
@@ -69,6 +69,7 @@ public class DasSourceRegistry implements DasSourceRegistryI,
     return loadingDasSources;
   }
 
+  @Override
   public String getDasRegistryURL()
   {
     String registry = jalview.bin.Cache.getDefault("DAS_REGISTRY_URL",
@@ -150,9 +151,8 @@ public class DasSourceRegistry implements DasSourceRegistryI,
       return dsrc;
     } catch (Exception ex)
     {
-      System.err.println("Failed to contact DAS1 registry at "
-              + registryURL);
-      ex.printStackTrace();
+      System.out.println("DAS1 registry at " + registryURL
+              + " no longer exists");
       return new ArrayList<jalviewSourceI>();
     }
   }