aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@verizonmedia.com>2020-09-17 11:05:46 +0200
committerValerij Fredriksen <valerijf@verizonmedia.com>2020-09-17 12:05:06 +0200
commitcf6cebc2af3ac90e0b1eb01b9621f91a6c9d9f17 (patch)
tree99cf298e5b5d20e844b5e1977ecf2555ef053a04
parent237bebb307533ac824492cf00f6f97efa3bbd1cf (diff)
Use class loader instead
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentReadResponse.java15
1 files changed, 9 insertions, 6 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentReadResponse.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentReadResponse.java
index f122768672d..dac9acb42bd 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentReadResponse.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionContentReadResponse.java
@@ -4,12 +4,12 @@ package com.yahoo.vespa.config.server.http;
import com.yahoo.config.application.api.ApplicationFile;
import com.yahoo.container.jdisc.HttpResponse;
+import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
+import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.UncheckedIOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
import java.util.HashMap;
import java.util.Map;
import java.util.regex.Pattern;
@@ -51,10 +51,13 @@ public class SessionContentReadResponse extends HttpResponse {
}
private static Map<String, String> loadContentTypeByExtension() {
- try {
- Pattern whitespace = Pattern.compile("\\s");
- Map<String, String> map = new HashMap<>();
- for (String line : Files.readAllLines(Paths.get("src/main/resources/mime.types"))) {
+ ClassLoader classLoader = SessionContentReadResponse.class.getClassLoader();
+ Pattern whitespace = Pattern.compile("\\s");
+ Map<String, String> map = new HashMap<>();
+
+ try (BufferedReader reader = new BufferedReader(new InputStreamReader(classLoader.getResourceAsStream("mime.types")))) {
+ while (reader.ready()) {
+ String line = reader.readLine();
if (line.isEmpty() || line.charAt(0) == '#') continue;
String[] parts = whitespace.split(line);