From 1a2ba04b767f8961836159fe0941729cb7222e89 Mon Sep 17 00:00:00 2001 From: Ezequiel Bergamaschi Date: Sat, 1 Feb 2014 04:13:18 -0300 Subject: [PATCH] fix filter by none --- .../com/wisemapping/rest/MindmapFilter.java | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapFilter.java b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapFilter.java index 6c1d6a5b..12ea81d8 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapFilter.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapFilter.java @@ -67,16 +67,19 @@ public abstract class MindmapFilter { static public MindmapFilter parse(@Nullable final String valueStr) { MindmapFilter result = null; - for (MindmapFilter value : MindmapFilter.values) { - if (value.id.equals(valueStr)) { - result = value; - break; + if (valueStr != null) { + for (MindmapFilter value : MindmapFilter.values) { + if (value.id.equals(valueStr)) { + result = value; + break; + } } - } - // valueStr is not a default filter - if (result == null) { - assert valueStr != null; - result = new LabelFilter(valueStr); + // valueStr is not a default filter + if (result == null) { + result = new LabelFilter(valueStr); + } + } else { + result = ALL; } return result; }