Author: fmeschbe
Date: Tue Aug 21 23:11:34 2007
New Revision: 568434
URL: http://svn.apache.org/viewvc?rev=568434&view=rev
Log:
Prevent NPE if a component to be validated does is not a service
Modified:
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/om/Component.java
Modified:
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/om/Component.java
URL:
http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/om/Component.java?rev=568434&r1=568433&r2=568434&view=diff
==============================================================================
---
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/om/Component.java
(original)
+++
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/om/Component.java
Tue Aug 21 23:11:34 2007
@@ -224,7 +224,9 @@
}
// verify service
- this.getService().validate(issues, warnings);
+ if (this.getService() != null) {
+ this.getService().validate(issues, warnings);
+ }
// serviceFactory must not be true for immediate of
component factory
if (this.isServiceFactory() && this.isImmediate() != null
&& this.isImmediate().booleanValue() && this.getFactory() != null) {
