Author: alesj Date: 2009-11-19 19:12:12 -0500 (Thu, 19 Nov 2009) New Revision: 96607 Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiScopeInfo.java Log: Check for null service. Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiScopeInfo.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiScopeInfo.java 2009-11-20 00:10:15 UTC (rev 96606) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiScopeInfo.java 2009-11-20 00:12:12 UTC (rev 96607) @@ -77,8 +77,12 @@ if (qualifier instanceof Class) return key; - Class<?> clazz = serviceState.getService().getClass(); - key.addScope(new Scope(CommonLevels.CLASS, clazz)); + Object service = serviceState.getService(); + if (service != null) + { + Class<?> clazz = service.getClass(); + key.addScope(new Scope(CommonLevels.CLASS, clazz)); + } return key; } } \ No newline at end of file