summaryrefslogtreecommitdiffstats
path: root/java/sca/modules/node-impl/src
diff options
context:
space:
mode:
authorrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2009-07-07 22:00:13 +0000
committerrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2009-07-07 22:00:13 +0000
commit7503791fc1255a986cf349460c6420c54d69e8b3 (patch)
treee661598ab723344de25cc1e3e734a4ba3857a617 /java/sca/modules/node-impl/src
parent10923a6b39453ce7862540fb406adeee778ab545 (diff)
Fix the merge of definitions
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@791990 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/modules/node-impl/src')
-rw-r--r--java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
index d4de78c81a..5e565cf3da 100644
--- a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
+++ b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
@@ -433,7 +433,7 @@ public class NodeFactoryImpl extends NodeFactory {
DefinitionsExtensionPoint definitionsExtensionPoint = extensionPoints.getExtensionPoint(DefinitionsExtensionPoint.class);
for(Definitions defs: definitionsExtensionPoint.getDefinitions()) {
- DefinitionsUtil.aggregate(systemDefinitions, defs);
+ DefinitionsUtil.aggregate(defs, systemDefinitions);
}
// Load the system definitions.xml from all of the loaded extension points