TOBAGO-1977: MimeTypeUtils might not be initalized correctly
* remove if info
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtils.java
index 5885261..7530c0b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtils.java
@@ -20,12 +20,16 @@
package org.apache.myfaces.tobago.internal.util;
import org.apache.myfaces.tobago.config.TobagoConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.servlet.ServletContext;
import java.util.Map;
public final class MimeTypeUtils {
+ private static final Logger LOG = LoggerFactory.getLogger(MimeTypeUtils.class);
+
private static Map<String, String> additionalMimeTypes = null;
private MimeTypeUtils() {
@@ -93,7 +97,7 @@
final TobagoConfig tobagoConfig = TobagoConfig.getInstance(servletContext);
additionalMimeTypes = tobagoConfig.getMimeTypes();
} else {
- throw new IllegalStateException(MimeTypeUtils.class.getSimpleName() + " is already initialized!");
+ LOG.error(MimeTypeUtils.class.getSimpleName() + " is already initialized!");
}
}
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java
index 5b23bfc..1bfd6f6 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoServletContextListener.java
@@ -49,12 +49,13 @@
}
TobagoConfigBuilder.init(servletContext);
+
+ MimeTypeUtils.init(servletContext);
+
if (LOG.isInfoEnabled()) {
final TobagoConfig tobagoConfig = TobagoConfig.getInstance(servletContext);
LOG.info("TobagoConfig: " + tobagoConfig);
- MimeTypeUtils.init(servletContext);
-
final ContentSecurityPolicy.Mode mode = tobagoConfig.getContentSecurityPolicy().getMode();
final StringBuilder builder = new StringBuilder();
builder.append("\n*************************************************************************************");
