aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2012-11-19 08:45:50 (EST)
committerGlyn Normington2012-11-23 08:04:00 (EST)
commit72a4f2188ff0c6fab36571dc77e0541cb14e19f6 (patch)
tree03ddc9d9466fdca9303f6cb86870811db91552b0
parentb7ea3483d7cd0406f8ba74cced5af861f3301a4f (diff)
downloadorg.eclipse.virgo.web-72a4f21.zip
org.eclipse.virgo.web-72a4f21.tar.gz
org.eclipse.virgo.web-72a4f21.tar.bz2
ensure suitable environment is created
-rw-r--r--org.eclipse.virgo.web.dm/src/main/java/org/eclipse/virgo/web/dm/ServerOsgiBundleXmlWebApplicationContext.java10
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();
+ }
+
}