commit 9688fe664bcdd4fa13c91efd78a76bde0680147d
author Glyn Normington <gnormington@vmware.com> Mon Nov 19 13:45:50 2012 +0000
committer Glyn Normington <gnormington@vmware.com> Mon Nov 19 13:45:50 2012 +0000
tree 5295126d05c208094bfeee6a969e89ea9fa477d5
parent fb910e7dd8d62e41ab31180d8864c162592c8038

ensure suitable environment is created

org.eclipse.virgo.web.dm/src/main/java/org/eclipse/virgo/web/dm/ServerOsgiBundleXmlWebApplicationContext.java

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.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 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public ConfigurableWebEnvironment getEnvironment() {
         ConfigurableEnvironment env = super.getEnvironment();
         if (env instanceof ConfigurableWebEnvironment) {
@@ -373,4 +375,12 @@
         }
     }
 
+    /** 
+     * {@inheritDoc}
+     */
+    @Override
+    protected ConfigurableEnvironment createEnvironment() {
+        return new StandardServletEnvironment();
+    }
+
 }