archive/apache-tuscany
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updaqte to only consider Nodes in the same domain

Browse source 
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@945641 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
antelder 2010-05-18 13:10:53 +00:00
commit 8fa0e586a6
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
View file

@ -157,9 +157,11 @@ public class NodeFactoryImpl extends NodeFactory {
public List<Node> getNodesInDomain(String domainName) {
List<Node> domainNodes = new ArrayList<Node>();
for (Node n : nodes.values()) {
if (domainName.equals(((NodeImpl)n).getConfiguration().getDomainURI())) {
domainNodes.add(n);
if (nodes != null) {
for (Node n : nodes.values()) {
if (domainName.equals(((NodeImpl)n).getConfiguration().getDomainURI())) {
domainNodes.add(n);
}
}
}
return domainNodes;
@ -302,7 +304,7 @@ public class NodeFactoryImpl extends NodeFactory {
for (BindingConfiguration config : configuration.getBindings()) {
bindingBaseURIs.put(config.getBindingType(), config.getBaseURIs());
}
List<Contribution> allContributions = getAllContributions();
List<Contribution> allContributions = getAllContributions(configuration.getDomainURI());
Composite domainComposite = deployer.build(contributions, allContributions, bindingBaseURIs, monitor);
analyzeProblems(monitor);
@ -312,10 +314,10 @@ public class NodeFactoryImpl extends NodeFactory {
return domainComposite;
}
private List<Contribution> getAllContributions() {
private List<Contribution> getAllContributions(String domainName) {
List<Contribution> contributions = new ArrayList<Contribution>();
for (NodeFactory f : getNodeFactories()) {
for (Node node : ((NodeFactoryImpl)f).getNodes().values()) {
for (Node node : ((NodeFactoryImpl)f).getNodesInDomain(domainName)) {
contributions.addAll(((NodeImpl)node).getContributions());
}
}