JsonTileGrid: fix NPE in optTile()

Change-Id: Ia7a9e668dbe185b19d233d6d04f832403a4c6e39
Reviewed-on: https://git.eclipse.org/r/132966
Tested-by: CI Bot
Reviewed-by: Beat Schwarzentrub <bsh@bsiag.com>

1 files changed, 7 insertions, 3 deletions

diff --git a/org.eclipse.scout.rt.ui.html/src/main/java/org/eclipse/scout/rt/ui/html/json/tile/JsonTileGrid.java b/org.eclipse.scout.rt.ui.html/src/main/java/org/eclipse/scout/rt/ui/html/json/tile/JsonTileGrid.java
index b6ec3ff2ee..9bbc239d1d 100644
--- a/org.eclipse.scout.rt.ui.html/src/main/java/org/eclipse/scout/rt/ui/html/json/tile/JsonTileGrid.java
+++ b/org.eclipse.scout.rt.ui.html/src/main/java/org/eclipse/scout/rt/ui/html/json/tile/JsonTileGrid.java
@@ -241,7 +241,7 @@ public class JsonTileGrid<T extends ITileGrid<? extends ITile>> extends Abstract
     return optTile(json.getString("tile"));
   }
 
-  private ITile getTile(String tileId) {
+  protected ITile getTile(String tileId) {
     Object model = getUiSession().getJsonAdapter(tileId).getModel();
     if (!(model instanceof ITile)) {
       throw new IllegalStateException("Id does not belong to a tile. Id: " + tileId);
@@ -249,8 +249,12 @@ public class JsonTileGrid<T extends ITileGrid<? extends ITile>> extends Abstract
     return (ITile) model;
   }
 
-  private ITile optTile(String tileId) {
-    Object model = getUiSession().getJsonAdapter(tileId).getModel();
+  protected ITile optTile(String tileId) {
+    IJsonAdapter<?> adapter = getUiSession().getJsonAdapter(tileId);
+    if (adapter == null) {
+      return null;
+    }
+    Object model = adapter.getModel();
     if (model == null) {
       return null;
     }