FELIX-2230 Prevent calling a method on a null component instance thus preventing NullPointerException
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@926998 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/helper/BaseMethod.java b/scr/src/main/java/org/apache/felix/scr/impl/helper/BaseMethod.java
index fcf2d39..6e3945c 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/helper/BaseMethod.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/helper/BaseMethod.java
@@ -209,8 +209,17 @@
{
try
{
- final Object[] params = getParameters( m_method, rawParameter );
- m_method.invoke( componentInstance, params );
+ if ( componentInstance != null )
+ {
+ final Object[] params = getParameters( m_method, rawParameter );
+ m_method.invoke( componentInstance, params );
+ }
+ else
+ {
+ getComponentManager().log( LogService.LOG_WARNING, "Method {0} cannot be called on null object",
+ new Object[]
+ { getMethodName() }, null );
+ }
}
catch ( IllegalStateException ise )
{