From bb74de7d594e0de1b4cf04d728edb7d63b363aca Mon Sep 17 00:00:00 2001 From: luccioman Date: Mon, 9 Apr 2018 00:01:45 +0200 Subject: [PATCH] Removed unnecessary "/admin" suffix from remote Solr instance admin URL For quite quite a long time now, the Solr /admin URL suffix indeed redirects to the Solr base context (see https://issues.apache.org/jira/browse/SOLR-3337) --- .../net/yacy/cora/federate/solr/instance/RemoteInstance.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source/net/yacy/cora/federate/solr/instance/RemoteInstance.java b/source/net/yacy/cora/federate/solr/instance/RemoteInstance.java index b1a88d761..5e6dc5a50 100644 --- a/source/net/yacy/cora/federate/solr/instance/RemoteInstance.java +++ b/source/net/yacy/cora/federate/solr/instance/RemoteInstance.java @@ -284,6 +284,9 @@ public class RemoteInstance implements SolrInstance { return o instanceof RemoteInstance && ((RemoteInstance) o).solrurl.equals(this.solrurl); } + /** + * @return the administration URL of the remote Solr instance + */ public String getAdminInterface() { final InetAddress localhostExternAddress = Domains.myPublicLocalIP(); final String localhostExtern = localhostExternAddress == null ? "127.0.0.1" : localhostExternAddress.getHostAddress(); @@ -292,7 +295,7 @@ public class RemoteInstance implements SolrInstance { if (p < 0) p = u.indexOf("127.0.0.1",0); if (p < 0) p = u.indexOf("0:0:0:0:0:0:0:1",0); if (p >= 0) u = u.substring(0, p) + localhostExtern + u.substring(p + 9); - return u + (u.endsWith("/") ? "admin/" : "/admin/"); + return u; } @Override