You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ed...@apache.org on 2009/08/07 17:29:54 UTC
svn commit: r802046 -
/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
Author: edwardsmj
Date: Fri Aug 7 15:29:22 2009
New Revision: 802046
URL: http://svn.apache.org/viewvc?rev=802046&view=rev
Log:
Better handling of case where contribution import is not satisfied, to avoid NPE when attempting to resolve artifacts against that import. Modified code in addContributionDependencies(...).
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=802046&r1=802045&r2=802046&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 Fri Aug 7 15:29:22 2009
@@ -248,13 +248,12 @@
// Now add the dependencies of that contribution
addContributionDependencies(dependency, contributions, dependencies, set, monitor);
- }
- }
- }
- }
+ } // end if
+ } // end if
+ } // end for
+ } // end for
if (resolved) {
-
// Initialize the import's model resolver with a delegating model
// resolver which will delegate to the matching exports
import_.setModelResolver(new DefaultImportModelResolver(matchingExports));
@@ -262,9 +261,11 @@
} else {
// Record import resolution issue
if (!(import_ instanceof DefaultImport)) {
+ // Add the (empty) matchingExports List and report a warning
+ import_.setModelResolver(new DefaultImportModelResolver(matchingExports));
warning(monitor, "UnresolvedImport", import_, import_);
}
- }
+ } // end if
}
}