Index: trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextServiceRevokedEvent.java =================================================================== --- trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextServiceRevokedEvent.java (revision 448441) +++ trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextServiceRevokedEvent.java (working copy) @@ -75,6 +75,9 @@ * @com.intel.drl.spec_ref */ public boolean isServiceClass(Class service) { + if (service == null) { + return false; + } return service.equals(this.serviceClass); } } Index: trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceRevokedEventTest.java =================================================================== --- trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceRevokedEventTest.java (revision 448441) +++ trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceRevokedEventTest.java (working copy) @@ -112,6 +112,8 @@ services, BeanContext.class, true); assertTrue(event.isServiceClass(BeanContext.class)); assertFalse(event.isServiceClass(Integer.class)); + //Regression for HARMONY-1516 + assertFalse(event.isServiceClass(null)); } public void testIsCurrentServiceInvalidNow() {