You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@harmony.apache.org by ml...@apache.org on 2006/09/12 08:52:41 UTC

svn commit: r442489 - /incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java

Author: mloenko
Date: Mon Sep 11 23:52:41 2006
New Revision: 442489

URL: http://svn.apache.org/viewvc?view=rev&rev=442489
Log:
applied patch for HARMONY-1168
[classlib][beans] compatibility: BeanContextServicesSupport.getCurrentServiceSelectors(null) lead to NPE on Harmony and returns 'null' on RI

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java?view=diff&rev=442489&r1=442488&r2=442489
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java Mon Sep 11 23:52:41 2006
@@ -427,6 +427,10 @@
      */
     public Iterator getCurrentServiceSelectors(Class serviceClass) {
 
+        if (serviceClass == null) {
+            return null;
+        }
+
         synchronized (BeanContext.globalHierarchyLock) {
             synchronized (this.services) {
                 BCSSServiceProvider bcsp = this.services.get(serviceClass);