Author: rfeng
Date: Mon Oct 2 14:32:18 2006
New Revision: 452225
URL: http://svn.apache.org/viewvc?view=rev&rev=452225
Log:
Fix the NPE
Modified:
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
Modified:
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java?view=diff&rev=452225&r1=452224&r2=452225
==============================================================================
---
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
(original)
+++
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
Mon Oct 2 14:32:18 2006
@@ -353,7 +353,7 @@
return instanceInterface.cast(this);
}
// resolve to parent
- if (parent == null) {
+ if (getParent() == null) {
return null;
}
return getParent().resolveInstance(instanceInterface);
@@ -387,7 +387,11 @@
} else {
try {
// resolve to parent
- return getParent().resolveSystemInstance(instanceInterface);
+ if (getParent() != null) {
+ return
getParent().resolveSystemInstance(instanceInterface);
+ } else {
+ return null;
+ }
} catch (AutowireResolutionException e) {
e.addContextName(getName());
throw e;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
