changeset 147:f5896ee78e30

Bug 2857: NPE occurs when user choose multiple exclude filter. Reviewed-by: ykubota GitHub: https://github.com/HeapStats/heapstats/pull/15
author Yasumasa Suenaga <yasuenag@gmail.com>
date Mon, 22 Feb 2016 22:44:19 +0900
parents 3b4e142bca0f
children 3fe4fbc1e7f0
files ChangeLog analyzer/fx/src/main/java/jp/co/ntt/oss/heapstats/plugin/builtin/snapshot/tabs/HistogramController.java
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Feb 13 17:02:49 2016 +0900
+++ b/ChangeLog	Mon Feb 22 22:44:19 2016 +0900
@@ -1,3 +1,7 @@
+2016-02-22  Yasumasa Suenaga <yasuenag@gmail.com>
+
+	* Bug 2857: NPE occurs when user choose multiple exclude filter.
+
 2016-02-13  Yasumasa Suenaga <yasuenag@gmail.com>
 
 	* Bug2847: LogLevel cannot change through JMX.
--- a/analyzer/fx/src/main/java/jp/co/ntt/oss/heapstats/plugin/builtin/snapshot/tabs/HistogramController.java	Sat Feb 13 17:02:49 2016 +0900
+++ b/analyzer/fx/src/main/java/jp/co/ntt/oss/heapstats/plugin/builtin/snapshot/tabs/HistogramController.java	Mon Feb 22 22:44:19 2016 +0900
@@ -175,7 +175,7 @@
                 super.updateItem(item, empty);
                 BindingFilter filter = (BindingFilter)getTableRow().getItem();
                 
-                if(!empty){
+                if(!empty && (filter != null)){
                     styleProperty().bind(Bindings.createStringBinding(() -> filter.appliedProperty().get() ? "-fx-text-fill: blue;" : "-fx-text-fill: black;", filter.appliedProperty()));
                     setText(filter.getName());
                 }