JAL-2316 Added unit tests for CustomUrlProvider

[jalview.git] / src / jalview / urls / CustomUrlProvider.java

diff --git a/src/jalview/urls/CustomUrlProvider.java b/src/jalview/urls/CustomUrlProvider.java
index 50037b6..2d26883 100644 (file)
--- a/src/jalview/urls/CustomUrlProvider.java
+++ b/src/jalview/urls/CustomUrlProvider.java
@@ -85,7 +85,8 @@ public class CustomUrlProvider extends UrlProviderImpl
         {
           rxstart = url.indexOf(DELIM + SEQUENCE_ID + DELIM);
         }
-        while (rxstart == -1 && url.indexOf("/=" + DELIM) == -1)
+        while (rxstart == -1 && url.indexOf("/=" + DELIM) == -1
+                && st.hasMoreTokens())
         {
           url = url + SEP + st.nextToken();
         }
@@ -260,6 +261,7 @@ public class CustomUrlProvider extends UrlProviderImpl
     {
       urls.put(DEFAULT_LABEL, new UrlLink(DEFAULT_STRING));
     }
+    defaultUrl = DEFAULT_LABEL;
     return DEFAULT_LABEL;
   }