Author: mduerig
Date: Thu Mar 20 12:36:51 2014
New Revision: 1579605
URL: http://svn.apache.org/r1579605
Log:
OAK-1581: NPE in OsgiWhiteboard#track()
Null guard
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/OsgiWhiteboard.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/OsgiWhiteboard.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/OsgiWhiteboard.java?rev=1579605&r1=1579604&r2=1579605&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/OsgiWhiteboard.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/OsgiWhiteboard.java
Thu Mar 20 12:36:51 2014
@@ -20,6 +20,7 @@ import static com.google.common.base.Pre
import static com.google.common.base.Preconditions.checkNotNull;
import static java.util.Arrays.asList;
+import java.util.Collections;
import java.util.Dictionary;
import java.util.Hashtable;
import java.util.List;
@@ -77,7 +78,8 @@ public class OsgiWhiteboard implements W
return new Tracker<T>() {
@Override @SuppressWarnings("unchecked")
public List<T> getServices() {
- return (List<T>) asList(tracker.getServices());
+ Object[] services = tracker.getServices();
+ return (List<T>) (services != null ? asList(services) :
Collections.emptyList());
}
@Override
public void stop() {
