ToOne: only access boxStore once known to be non-null (fix NPE).

greenrobot-team · greenrobot-team · commit 6be50d64aa06 · 2018-08-06T08:50:40.000+02:00
#516
diff --git a/objectbox-java/src/main/java/io/objectbox/relation/ToOne.java b/objectbox-java/src/main/java/io/objectbox/relation/ToOne.java
@@ -112,7 +112,6 @@ private void ensureBoxes(TARGET target) {
             Field boxStoreField = ReflectionCache.getInstance().getField(entity.getClass(), "__boxStore");
             try {
                 boxStore = (BoxStore) boxStoreField.get(entity);
-                debugRelations = boxStore.isDebugRelations();
                 if (boxStore == null) {
                     if (target != null) {
                         boxStoreField = ReflectionCache.getInstance().getField(target.getClass(), "__boxStore");
@@ -123,6 +122,7 @@ private void ensureBoxes(TARGET target) {
                                 "call box.attach(entity) beforehand.");
                     }
                 }
+                debugRelations = boxStore.isDebugRelations();
             } catch (IllegalAccessException e) {
                 throw new RuntimeException(e);
             }

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,6 @@ private void ensureBoxes(TARGET target) {`
`112`	`112`	`Field boxStoreField = ReflectionCache.getInstance().getField(entity.getClass(), "__boxStore");`
`113`	`113`	`try {`
`114`	`114`	`boxStore = (BoxStore) boxStoreField.get(entity);`
`115`		`- debugRelations = boxStore.isDebugRelations();`
`116`	`115`	`if (boxStore == null) {`
`117`	`116`	`if (target != null) {`
`118`	`117`	`boxStoreField = ReflectionCache.getInstance().getField(target.getClass(), "__boxStore");`
`@@ -123,6 +122,7 @@ private void ensureBoxes(TARGET target) {`
`123`	`122`	`"call box.attach(entity) beforehand.");`
`124`	`123`	`}`
`125`	`124`	`}`
	`125`	`+ debugRelations = boxStore.isDebugRelations();`
`126`	`126`	`} catch (IllegalAccessException e) {`
`127`	`127`	`throw new RuntimeException(e);`
`128`	`128`	`}`