honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add back check with a note, so anyone reviewing isn't confused.

This commit is contained in:
Robert Muir 2015-06-29 13:20:53 -04:00
parent b93af3c27c
commit 3f95275f23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/org/elasticsearch/bootstrap/Security.java
View File

@ -87,6 +87,11 @@ final class Security {
for (Map.Entry<Pattern,String> e : SPECIAL_JARS.entrySet()) { for (Map.Entry<Pattern,String> e : SPECIAL_JARS.entrySet()) {
if (e.getKey().matcher(url.getPath()).matches()) { if (e.getKey().matcher(url.getPath()).matches()) {
String prop = e.getValue(); String prop = e.getValue();
// TODO: we need to fix plugins to not include duplicate e.g. lucene-core jars,
// to add back this safety check! see https://github.com/elastic/elasticsearch/issues/11647
// if (System.getProperty(prop) != null) {
// throw new IllegalStateException("property: " + prop + " is unexpectedly set: " + System.getProperty(prop));
//}
System.setProperty(prop, url.toString()); System.setProperty(prop, url.toString());
} }
} }