summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/modules/host-webapp/src/main/java
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2010-01-18 12:00:21 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2010-01-18 12:00:21 +0000
commitc0b480ce1460f90294bd2b4e95573c0e7ae64118 (patch)
treec34c364b81a9962ab623f311c54c85e238f45d33 /sca-java-2.x/trunk/modules/host-webapp/src/main/java
parent852025a434345de1a4fada20943282a78c905869 (diff)
Change Node getInstance/newInstance methods so that newInstance really creates a new instance, and getInstance returns the singleton instance
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@900354 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/modules/host-webapp/src/main/java')
-rw-r--r--sca-java-2.x/trunk/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java7
1 files changed, 1 insertions, 6 deletions
diff --git a/sca-java-2.x/trunk/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java b/sca-java-2.x/trunk/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java
index ea6bb50cd7..d157b5f565 100644
--- a/sca-java-2.x/trunk/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java
+++ b/sca-java-2.x/trunk/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/ServletHostHelper.java
@@ -70,7 +70,6 @@ public class ServletHostHelper {
configuration = factory.loadConfiguration(url.openStream(), url);
} else {
configuration = factory.createNodeConfiguration();
- configuration.setDomainURI(factory.getDomainURI());
Enumeration<String> names = servletContext.getAttributeNames();
while (names.hasMoreElements()) {
String name = names.nextElement();
@@ -132,11 +131,7 @@ public class ServletHostHelper {
org.apache.tuscany.sca.host.http.ServletHostHelper.setWebappHost(true);
try {
String domainName = (String)servletContext.getAttribute(DOMAIN_NAME_ATTR);
- if (domainName != null) {
- factory = NodeFactory.getInstance(domainName);
- } else {
- factory = NodeFactory.newInstance();
- }
+ factory = NodeFactory.getInstance();
for (Enumeration<String> e = servletContext.getInitParameterNames(); e.hasMoreElements();) {
String name = e.nextElement();
String value = servletContext.getInitParameter(name);