From fd207779a42554d576f6b4a587249446fc992bae Mon Sep 17 00:00:00 2001 From: rfeng Date: Mon, 8 Feb 2010 21:36:46 +0000 Subject: Generate unique Node URI if it's not set in the NodeConfiguration git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@907810 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/tuscany/sca/node/NodeFactory.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache') diff --git a/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java b/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java index 8f7859367a..69f09e55da 100644 --- a/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java +++ b/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java @@ -415,12 +415,11 @@ public abstract class NodeFactory extends DefaultNodeConfigurationFactory { return createNode(contributions); } - private volatile static int count =0; private NodeConfiguration createConfiguration(Contribution... contributions) { NodeConfigurationFactory factory = this; NodeConfiguration configuration = factory.createNodeConfiguration(); // Make sure a unique node URI is created for the same node factory - configuration.setURI(Node.DEFAULT_NODE_URI+(count++)); + configuration.setURI(generateNodeURI()); if (contributions != null) { for (Contribution c : contributions) { configuration.addContribution(c.getURI(), c.getLocation()); @@ -429,6 +428,12 @@ public abstract class NodeFactory extends DefaultNodeConfigurationFactory { return configuration; } + private static int count = 0; + + protected synchronized String generateNodeURI() { + return Node.DEFAULT_NODE_URI + (count++); + } + private Contribution[] getContributions(List locations) { Contribution[] contributions = new Contribution[locations.size()]; int index = 0; -- cgit v1.2.3