diff options
| author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2010-01-18 12:00:21 +0000 |
|---|---|---|
| committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2010-01-18 12:00:21 +0000 |
| commit | c0b480ce1460f90294bd2b4e95573c0e7ae64118 (patch) | |
| tree | c34c364b81a9962ab623f311c54c85e238f45d33 /sca-java-2.x/trunk/modules/node-impl-osgi/src | |
| parent | 852025a434345de1a4fada20943282a78c905869 (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/node-impl-osgi/src')
2 files changed, 2 insertions, 2 deletions
diff --git a/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/AbstractOSGiServiceHandler.java b/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/AbstractOSGiServiceHandler.java index 7c9cf8ef6e..5a4b5aa836 100644 --- a/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/AbstractOSGiServiceHandler.java +++ b/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/AbstractOSGiServiceHandler.java @@ -63,7 +63,7 @@ public class AbstractOSGiServiceHandler implements LifeCycleListener { protected synchronized void init() { if (nodeFactory == null) { - this.nodeFactory = (NodeFactoryImpl)NodeFactory.newInstance(); + this.nodeFactory = (NodeFactoryImpl)NodeFactory.getInstance(); this.nodeFactory.init(); this.discoveryTracker = LocalDiscoveryService.getTracker(context); discoveryTracker.open(); diff --git a/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/AbstractDiscoveryService.java b/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/AbstractDiscoveryService.java index 6f0144a71e..4bbf130c74 100644 --- a/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/AbstractDiscoveryService.java +++ b/sca-java-2.x/trunk/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/AbstractDiscoveryService.java @@ -102,7 +102,7 @@ public abstract class AbstractDiscoveryService implements Discovery, LifeCycleLi } protected ExtensionPointRegistry getExtensionPointRegistry() { - NodeFactoryImpl factory = (NodeFactoryImpl)NodeFactory.newInstance(); + NodeFactoryImpl factory = (NodeFactoryImpl)NodeFactory.getInstance(); factory.init(); ServiceTracker tracker = new ServiceTracker(context, ExtensionPointRegistry.class.getName(), null); tracker.open(); |