[felix-dev] branch master updated: FELIX-6584 : Avoid registering default servlet context as service

[cziegeler]

This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git


The following commit(s) were added to refs/heads/master by this push:
     new 886783ef1f FELIX-6584 : Avoid registering default servlet context as 
service
886783ef1f is described below

commit 886783ef1fe904c52391aba90171460415ff4f3c
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Tue Nov 22 08:59:18 2022 +0100

    FELIX-6584 : Avoid registering default servlet context as service
---
 .../base/internal/whiteboard/PerBundleServletContextImpl.java | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git 
a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/PerBundleServletContextImpl.java
 
b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/PerBundleServletContextImpl.java
index ae5fd5d053..8e98a18227 100644
--- 
a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/PerBundleServletContextImpl.java
+++ 
b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/PerBundleServletContextImpl.java
@@ -27,7 +27,6 @@ import java.util.Set;
 import org.apache.felix.http.base.internal.HttpConfig;
 import org.apache.felix.http.base.internal.context.ExtServletContext;
 import org.apache.felix.http.base.internal.registry.PerContextHandlerRegistry;
-import org.apache.felix.http.base.internal.util.MimeTypes;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.wiring.BundleWiring;
 import org.osgi.service.servlet.context.ServletContextHelper;
@@ -131,9 +130,6 @@ public class PerBundleServletContextImpl implements 
ExtServletContext {
         return this.bundle.adapt(BundleWiring.class).getClassLoader();
     }
 
-    /**
-     * @see jakarta.servlet.ServletContext#getResource(java.lang.String)
-     */
     @Override
     public URL getResource(final String path)
     {
@@ -143,12 +139,7 @@ public class PerBundleServletContextImpl implements 
ExtServletContext {
     @Override
     public String getMimeType(final String name)
     {
-        String type = this.contextHelper.getMimeType(name);
-        if (type != null) {
-            return type;
-        }
-
-        return MimeTypes.get().getByFile(name);
+        return this.contextHelper.getMimeType(name);
     }
 
     @Override