From ae9a39edb92cad8394743e518650d42b2c41efd2 Mon Sep 17 00:00:00 2001 From: James Muehlner Date: Tue, 6 Oct 2015 23:05:18 -0700 Subject: [PATCH] GUAC-1193: Do not search for empty terms. --- .../net/basic/rest/history/HistoryRESTService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/history/HistoryRESTService.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/history/HistoryRESTService.java index 0534d3b47..5f8584772 100644 --- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/history/HistoryRESTService.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/history/HistoryRESTService.java @@ -124,8 +124,10 @@ public class HistoryRESTService { ConnectionRecordSet history = userContext.getConnectionHistory(); // Restrict to records which contain the specified strings - for (String required : requiredContents) - history = history.contains(required); + for (String required : requiredContents) { + if (!required.isEmpty()) + history = history.contains(required); + } // Sort according to specified ordering for (APIConnectionRecordSortPredicate predicate : sortPredicates)