cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r703444 - /cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/OsgiUtils.java
Date Fri, 10 Oct 2008 12:54:28 GMT
Author: sergeyb
Date: Fri Oct 10 05:54:27 2008
New Revision: 703444

URL: http://svn.apache.org/viewvc?rev=703444&view=rev
Log:
DOSGI : minor update to OsgiUtils to avoid NPE

Modified:
    cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/OsgiUtils.java

Modified: cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/OsgiUtils.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/OsgiUtils.java?rev=703444&r1=703443&r2=703444&view=diff
==============================================================================
--- cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/OsgiUtils.java (original)
+++ cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/OsgiUtils.java Fri
Oct 10 05:54:27 2008
@@ -29,9 +29,9 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.StringTokenizer;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.StringTokenizer;
 
 import org.apache.cxf.dosgi.dsw.qos.IntentMap;
 import org.apache.cxf.dosgi.dsw.service.ServiceEndpointDescriptionImpl;
@@ -246,8 +246,11 @@
                 props.put(key, sd.getProperty(key.toString()));
             }
         }
-        props.put(org.osgi.framework.Constants.OBJECTCLASS, 
-                  getInterfaceNames(sd, interfaceName));
+        String[] interfaceNames = getInterfaceNames(sd, interfaceName);
+        if (interfaceNames != null) {
+            props.put(org.osgi.framework.Constants.OBJECTCLASS, 
+                      interfaceNames);
+        }
         return filter.match(props);
     }
     



Mime
View raw message