This commit is contained in:
Greg DiCristofaro 2022-03-28 15:09:28 -04:00
parent 6fcdcde885
commit c4524263bd
2 changed files with 13 additions and 5 deletions

View File

@ -22,16 +22,16 @@
<!-- Autopsy --> <!-- Autopsy -->
<dependency conf="autopsy->default" org="org.apache.solr" name="solr-solrj" rev="8.11.1"/> <dependency conf="autopsy->default" org="org.apache.solr" name="solr-solrj" rev="8.11.1"/>
<dependency conf="autopsy->default" org="com.optimaize.languagedetector" name="language-detector" rev="0.6"/> <dependency conf="autopsy->default" org="com.optimaize.languagedetector" name="language-detector" rev="0.6"/>
<!-- <dependency conf="autopsy->default" org="org.apache.cxf" name="cxf-rt-rs-client" rev="3.5.0"/> --> <!-- <dependency conf="autopsy->default" org="org.apache.cxf" name="cxf-rt-rs-client" rev="3.5.1"/> -->
<!-- <dependency conf="autopsy->default" org="org.cleartk" name="cleartk-ml" rev="2.0.0"/> --> <!-- <dependency conf="autopsy->default" org="org.cleartk" name="cleartk-ml" rev="2.0.0"/> -->
<!-- icu4j for pdfbox bidirectional text support, needs to be defined explicitely (it is optional) --> <!-- icu4j for pdfbox bidirectional text support, needs to be defined explicitely (it is optional) -->
<dependency conf="autopsy->default" org="com.ibm.icu" name="icu4j" rev="70.1"/> <dependency conf="autopsy->default" org="com.ibm.icu" name="icu4j" rev="70.1"/>
<!-- Jetty --> <!-- Jetty -->
<!-- <dependency conf="start-solr->default" org="org.eclipse.jetty" name="jetty-start" rev="8.1.16.v20140903"/> <!-- <dependency conf="start-solr->default" org="org.eclipse.jetty" name="jetty-start" rev="11.0.8"/>
<dependency conf="jetty-libs->default" org="org.eclipse.jetty" name="jetty-server" rev="8.1.16.v20140903"/> <dependency conf="jetty-libs->default" org="org.eclipse.jetty" name="jetty-server" rev="11.0.8"/>
<dependency conf="jetty-libs->default" org="org.eclipse.jetty" name="jetty-deploy" rev="8.1.16.v20140903"/> <dependency conf="jetty-libs->default" org="org.eclipse.jetty" name="jetty-deploy" rev="11.0.8"/>
<dependency conf="servlet->default" org="org.eclipse.jetty.orbit" name="javax.servlet" rev="3.0.0.v201112011016"/> --> <dependency conf="servlet->default" org="org.eclipse.jetty.orbit" name="javax.servlet" rev="3.0.0.v201112011016"/> -->
<exclude org="*" ext="*" type="javadoc"/> <exclude org="*" ext="*" type="javadoc"/>

View File

@ -2003,7 +2003,15 @@ public class Server {
NamedList<?> cluster = (NamedList) statusResponse.getResponse().get("cluster"); NamedList<?> cluster = (NamedList) statusResponse.getResponse().get("cluster");
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
ArrayList<String> liveNodes = (ArrayList) cluster.get("live_nodes"); List<String> liveNodes = (ArrayList) cluster.get("live_nodes");
if (liveNodes != null) {
liveNodes = liveNodes.stream()
.map(serverStr -> serverStr.endsWith("_solr")
? serverStr.substring(0, serverStr.length() - "_solr".length())
: serverStr)
.collect(Collectors.toList());
}
return liveNodes; return liveNodes;
} catch (Exception ex) { } catch (Exception ex) {
// intentional "catch all" as Solr is known to throw all kinds of Runtime exceptions // intentional "catch all" as Solr is known to throw all kinds of Runtime exceptions