Author: rfeng
Date: Tue Jul 7 22:00:13 2009
New Revision: 791990
URL: http://svn.apache.org/viewvc?rev=791990&view=rev
Log:
Fix the merge of definitions
Modified:
tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
Modified:
tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java?rev=791990&r1=791989&r2=791990&view=diff
==============================================================================
---
tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
(original)
+++
tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
Tue Jul 7 22:00:13 2009
@@ -433,7 +433,7 @@
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
