MEECROWAVE-87 from Ravisankar Challa's feedback, ensuring file path test works for windows
git-svn-id: https://svn.apache.org/repos/asf/openwebbeans/meecrowave/trunk@1819399 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java b/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
index f4570ac..2e81025 100644
--- a/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
+++ b/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
@@ -20,6 +20,7 @@
import static java.util.Collections.emptyList;
import static java.util.Collections.emptySet;
+import static java.util.Locale.ROOT;
import static java.util.Optional.ofNullable;
import static java.util.stream.Collectors.toList;
import static java.util.stream.Collectors.toSet;
@@ -57,8 +58,10 @@
import java.util.Set;
import java.util.TreeMap;
import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BiPredicate;
import java.util.function.Consumer;
import java.util.function.Function;
+import java.util.function.Predicate;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
@@ -677,11 +680,13 @@
return this;
}
- private boolean isCertificateFromClasspath(String certificate) {
+ private boolean isCertificateFromClasspath(final String certificate) {
+ final BiPredicate<String, String> equals = System.getProperty("os.name", "ignore").toLowerCase(ROOT).contains("win") ?
+ String::equalsIgnoreCase : String::equals;
return certificate != null && !(new File(certificate).exists())
- && !(Paths.get(System.getProperty("user.home"))
- .resolve(".keystore")
- .toString().equalsIgnoreCase(certificate));
+ && !equals.test(
+ Paths.get(System.getProperty("user.home")).resolve(".keystore").toAbsolutePath().normalize().toString(),
+ Paths.get(certificate).toAbsolutePath().normalize().toString());
}
private void copyCertificateToConfDir(String certificate) {
