Merge pull request ReactiveX#302 from rgerasimen/patch-1

Update Observable.isInternalImplementation, get rid of NullPointerExcept...
rickbw · Jul 5, 2013 · 29c52e7 · 29c52e7
2 parents aaaf4c9 + 871561c
commit 29c52e7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/rxjava-core/src/main/java/rx/Observable.java b/rxjava-core/src/main/java/rx/Observable.java
@@ -3745,7 +3745,8 @@ private boolean isInternalImplementation(Object o) {
         if (o instanceof AtomicObserver)
             return true;
         // we treat the following package as "internal" and don't wrap it
-        return o.getClass().getPackage().getName().startsWith("rx.operators");
+        Package p = o.getClass().getPackage(); // it can be null
+        return p != null && p.getName().startsWith("rx.operators");
     }
 
     public static class UnitTest {