Skip to content

Commit 10eb4dd

Browse files
author
GWA
committed
Bug fix: Fixed NullPointer in class NullValueColorHandler.
1 parent dea797e commit 10eb4dd

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

sql12/core/doc/changes.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ Table cell data popup now offers find, Xml/Json-reformatting and export function
7979

8080
Bug fixes:
8181

82+
Fixed NullPointer in class NullValueColorHandler.
83+
8284
https://github.com/squirrel-sql-client/squirrel-sql-code/issues/46
8385
Excel export: The "Auto filter" option activated the auto filter for
8486
one extra (empty) column at the end of the Excel sheet.

sql12/core/src/net/sourceforge/squirrel_sql/fw/datasetviewer/coloring/NullValueColorHandler.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package net.sourceforge.squirrel_sql.fw.datasetviewer.coloring;
22

3+
import java.awt.Color;
4+
35
import net.sourceforge.squirrel_sql.client.Main;
46
import net.sourceforge.squirrel_sql.client.session.ISession;
57
import net.sourceforge.squirrel_sql.client.session.properties.SessionProperties;
68
import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetViewerTable;
79

8-
import java.awt.Color;
9-
1010
public class NullValueColorHandler
1111
{
1212
private boolean _colorNullValues;
@@ -56,12 +56,18 @@ private void checkForPropertiesUpdates()
5656

5757
_lastPropertiesCheckTime = currentTimeMillis;
5858

59+
if( null != _dataSetViewerTable.getSessionOrNull() )
60+
{
61+
return;
62+
}
63+
5964
if( _nullValueColor.getRGB() != _dataSetViewerTable.getSessionOrNull().getProperties().getNullValueColorRGB()
60-
|| _colorNullValues != _dataSetViewerTable.getSessionOrNull().getProperties().isColorNullValues())
65+
|| _colorNullValues != _dataSetViewerTable.getSessionOrNull().getProperties().isColorNullValues())
6166
{
6267
_nullValueColor = new Color(_dataSetViewerTable.getSessionOrNull().getProperties().getNullValueColorRGB());
6368
_colorNullValues = _dataSetViewerTable.getSessionOrNull().getProperties().isColorNullValues();
6469
_dataSetViewerTable.repaint();
6570
}
71+
6672
}
6773
}

0 commit comments

Comments
 (0)