Fixes NPE when predicting on an empty "gbtree" model

michalkurka · michalkurka · commit 1582a328a9cf · 2018-08-23T14:20:32.000-07:00
diff --git a/xgboost-predictor/src/main/java/biz/k11i/xgboost/gbm/GBTree.java b/xgboost-predictor/src/main/java/biz/k11i/xgboost/gbm/GBTree.java
@@ -31,9 +31,7 @@ public void loadModel(ModelReader reader, boolean with_pbuffer) throws IOExcepti
             trees[i].loadModel(reader);
         }
 
-        if (mparam.num_trees != 0) {
-            tree_info = reader.readIntArray(mparam.num_trees);
-        }
+        tree_info = mparam.num_trees > 0 ? reader.readIntArray(mparam.num_trees) : new int[0];
 
         if (mparam.num_pbuffer != 0 && with_pbuffer) {
             reader.skip(4 * mparam.predBufferSize());

Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,7 @@ public void loadModel(ModelReader reader, boolean with_pbuffer) throws IOExcepti`
`31`	`31`	`trees[i].loadModel(reader);`
`32`	`32`	`}`
`33`	`33`
`34`		`- if (mparam.num_trees != 0) {`
`35`		`- tree_info = reader.readIntArray(mparam.num_trees);`
`36`		`- }`
	`34`	`+ tree_info = mparam.num_trees > 0 ? reader.readIntArray(mparam.num_trees) : new int[0];`
`37`	`35`
`38`	`36`	`if (mparam.num_pbuffer != 0 && with_pbuffer) {`
`39`	`37`	`reader.skip(4 * mparam.predBufferSize());`