Skip to content

Commit

Permalink
fix: NPE when passing null() as a resultset
Browse files Browse the repository at this point in the history
  • Loading branch information
Stephan Wald committed Apr 29, 2019
1 parent 37d039a commit 4e3c546
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions BBjGridExWidget.bbj
Expand Up @@ -615,7 +615,7 @@ class public BBjGridExWidget extends BBjWidget
rem if the data fed to the grid is the same as before, it's an update.
rem In this case we want to retain the setting of the columns
rem and the order and sizes
if (rs!.size() >0) then
if rs! <> NULL() AND rs!.size() >0 then
r1! = rs!.getItem(0)
datafingerprint$ = r1!.getFieldNames().toString()
keep=0
Expand All @@ -625,12 +625,14 @@ class public BBjGridExWidget extends BBjWidget
FI
FI

#RS!.createIndex()
if #RS!<> null() then
#RS!.createIndex()
fi
#TREE! = null()
#URL$=""
#performGridDataUpdate()

if (rs!.size() >0) then
if rs! <> NULL() AND rs!.size() >0 then
if tmpstate!<>null() then
#setColumnState(tmpstate!)
FI
Expand Down

0 comments on commit 4e3c546

Please sign in to comment.