From: Jim Procter <jprocter@dundee.ac.uk>
Date: Fri, 27 Feb 2015 17:01:08 +0000 (+0000)
Subject: JAL-1678 - patch to make sure we only compare positions of the last / or ?
X-Git-Tag: Jalview_2_9~87^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=be170b5c092fdb42a0275ca4d71051917b21650b;p=jalview.git

JAL-1678 - patch to make sure we only compare positions of the last / or ?
---

diff --git a/src/jalview/appletgui/AlignFrame.java b/src/jalview/appletgui/AlignFrame.java
index e84c335..7afe1fa 100644
--- a/src/jalview/appletgui/AlignFrame.java
+++ b/src/jalview/appletgui/AlignFrame.java
@@ -1281,7 +1281,8 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener,
     StringBuffer url = new StringBuffer(jalviewServletURL);
 
     // allow servlet parameters to be passed in applet parameter
-    String firstSep = url.indexOf("?") > url.indexOf("/") ? "&" : "?";
+    String firstSep = url.lastIndexOf("?") > url.lastIndexOf("/") ? "&"
+            : "?";
     url.append(firstSep);
 
     url.append("open="