ensure suitable environment is created

1 files changed, 10 insertions, 0 deletions

diff --git a/org.eclipse.virgo.web.dm/src/main/java/org/eclipse/virgo/web/dm/ServerOsgiBundleXmlWebApplicationContext.java b/org.eclipse.virgo.web.dm/src/main/java/org/eclipse/virgo/web/dm/ServerOsgiBundleXmlWebApplicationContext.java
index 9f45448..43d7f69 100644
--- a/org.eclipse.virgo.web.dm/src/main/java/org/eclipse/virgo/web/dm/ServerOsgiBundleXmlWebApplicationContext.java
+++ b/org.eclipse.virgo.web.dm/src/main/java/org/eclipse/virgo/web/dm/ServerOsgiBundleXmlWebApplicationContext.java
@@ -43,6 +43,7 @@ import org.springframework.web.context.ServletContextAware;
 import org.springframework.web.context.support.AbstractRefreshableWebApplicationContext;
 import org.springframework.web.context.support.ServletContextAwareProcessor;
 import org.springframework.web.context.support.ServletContextResourcePatternResolver;
+import org.springframework.web.context.support.StandardServletEnvironment;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 import org.springframework.web.context.support.XmlWebApplicationContext;
 
@@ -364,6 +365,7 @@ public class ServerOsgiBundleXmlWebApplicationContext extends OsgiBundleXmlAppli
     /**
      * {@inheritDoc}
      */
+    @Override
     public ConfigurableWebEnvironment getEnvironment() {
         ConfigurableEnvironment env = super.getEnvironment();
         if (env instanceof ConfigurableWebEnvironment) {
@@ -373,4 +375,12 @@ public class ServerOsgiBundleXmlWebApplicationContext extends OsgiBundleXmlAppli
         }
     }
 
+    /** 
+     * {@inheritDoc}
+     */
+    @Override
+    protected ConfigurableEnvironment createEnvironment() {
+        return new StandardServletEnvironment();
+    }
+
 }