From 7503791fc1255a986cf349460c6420c54d69e8b3 Mon Sep 17 00:00:00 2001 From: rfeng Date: Tue, 7 Jul 2009 22:00:13 +0000 Subject: Fix the merge of definitions git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@791990 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java/sca/modules/node-impl/src') 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 -- cgit v1.2.3