From c5541b42dc86496dcb959e33d640f6f638b48555 Mon Sep 17 00:00:00 2001 From: Asharani Date: Tue, 31 May 2016 17:45:24 +0530 Subject: [PATCH 1/2] Added null check for address host Signed-off-by: Asharani --- .../hawkbit/ui/filter/target/TargetSearchTextFilter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filter/target/TargetSearchTextFilter.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filter/target/TargetSearchTextFilter.java index c834c0d74..e6decd00a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filter/target/TargetSearchTextFilter.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filter/target/TargetSearchTextFilter.java @@ -56,7 +56,7 @@ public class TargetSearchTextFilter implements FilterExpression { } private boolean ipAddressIgnoreCase() { - if (target.getTargetInfo().getAddress() == null) { + if (target.getTargetInfo().getAddress() == null || target.getTargetInfo().getAddress().getHost() == null) { return false; } return target.getTargetInfo().getAddress().getHost().toUpperCase().contains(searchTextUpper); From 3e6930419e4bf4b9eca73c3fced8dc7ce2154165 Mon Sep 17 00:00:00 2001 From: Michael Hirsch Date: Tue, 31 May 2016 15:43:49 +0200 Subject: [PATCH 2/2] refactor code Signed-off-by: Michael Hirsch --- .../hawkbit/ui/filter/target/TargetSearchTextFilter.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filter/target/TargetSearchTextFilter.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filter/target/TargetSearchTextFilter.java index e6decd00a..64e9067e9 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filter/target/TargetSearchTextFilter.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filter/target/TargetSearchTextFilter.java @@ -3,6 +3,8 @@ */ package org.eclipse.hawkbit.ui.filter.target; +import java.net.URI; + import org.eclipse.hawkbit.repository.model.Target; import org.eclipse.hawkbit.ui.filter.FilterExpression; @@ -56,9 +58,10 @@ public class TargetSearchTextFilter implements FilterExpression { } private boolean ipAddressIgnoreCase() { - if (target.getTargetInfo().getAddress() == null || target.getTargetInfo().getAddress().getHost() == null) { + final URI targetAddress = target.getTargetInfo().getAddress(); + if (targetAddress == null || targetAddress.getHost() == null) { return false; } - return target.getTargetInfo().getAddress().getHost().toUpperCase().contains(searchTextUpper); + return targetAddress.getHost().toUpperCase().contains(searchTextUpper); } }