summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2010-05-05 11:03:53 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2010-05-05 11:03:53 +0000
commit6912fb8627220570e7399ca727b4b2b416c4d3a0 (patch)
treed5ea8d624b68fb64e11e92e1cca8a73f2daf7e91 /sca-java-2.x/trunk
parent2e4bea9bc1938da9159b71b814fd67423944f077 (diff)
Use default node factory config if no config init param exists
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@941245 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk')
-rw-r--r--sca-java-2.x/trunk/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppHelper.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/sca-java-2.x/trunk/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppHelper.java b/sca-java-2.x/trunk/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppHelper.java
index ec8ead0b7a..1dc6a3c594 100644
--- a/sca-java-2.x/trunk/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppHelper.java
+++ b/sca-java-2.x/trunk/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppHelper.java
@@ -141,7 +141,11 @@ public class WebAppHelper {
try {
String configValue = servletContext.getInitParameter("org.apache.tuscany.sca.config");
- factory = NodeFactory.newInstance(configValue);
+ if (configValue != null) {
+ factory = NodeFactory.newInstance(configValue);
+ } else {
+ factory = NodeFactory.newInstance();
+ }
ExtensionPointRegistry registry = factory.getExtensionPointRegistry();
ServletHostExtensionPoint servletHosts = registry.getExtensionPoint(ServletHostExtensionPoint.class);
servletHosts.setWebApp(true);