Merge pull request #302 from rgerasimen/patch-1

benjchristensen · benjchristensen · commit ea840061b8ad · 2013-07-05T14:15:34.000-07:00
Update Observable.isInternalImplementation, get rid of NullPointerExcept...
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 {

Original file line number	Diff line number	Diff line change
`@@ -3745,7 +3745,8 @@ private boolean isInternalImplementation(Object o) {`
`3745`	`3745`	`if (o instanceof AtomicObserver)`
`3746`	`3746`	`return true;`
`3747`	`3747`	`// we treat the following package as "internal" and don't wrap it`
`3748`		`- return o.getClass().getPackage().getName().startsWith("rx.operators");`
	`3748`	`+ Package p = o.getClass().getPackage(); // it can be null`
	`3749`	`+ return p != null && p.getName().startsWith("rx.operators");`
`3749`	`3750`	`}`
`3750`	`3751`
`3751`	`3752`	`public static class UnitTest {`