You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by fm...@apache.org on 2010/04/08 09:30:31 UTC
svn commit: r931811 -
/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/ServicesServlet.java
Author: fmeschbe
Date: Thu Apr 8 07:30:30 2010
New Revision: 931811
URL: http://svn.apache.org/viewvc?rev=931811&view=rev
Log:
FELIX-2260 Prevent NullPointerException if no services are available
Modified:
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/ServicesServlet.java
Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/ServicesServlet.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/ServicesServlet.java?rev=931811&r1=931810&r2=931811&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/ServicesServlet.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/ServicesServlet.java Thu Apr 8 07:30:30 2010
@@ -274,13 +274,19 @@ public class ServicesServlet extends Sim
{
try
{
- return getBundleContext().getAllServiceReferences( null, null );
+ final ServiceReference[] refs = getBundleContext().getAllServiceReferences( null, null );
+ if ( refs != null )
+ {
+ return refs;
+ }
}
catch ( InvalidSyntaxException e )
{
log( "Unable to access service reference list.", e );
- return NO_REFS;
}
+
+ // no services or invalid filter syntax (unlikely)
+ return NO_REFS;
}