Fix issue #22

NiceSystems · Feb 5, 2013 · 0dc6bb3 · 0dc6bb3
1 parent b4de966
commit 0dc6bb3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/main/java/hrider/hbase/QueryScanner.java b/src/main/java/hrider/hbase/QueryScanner.java
@@ -162,7 +162,7 @@ protected Scan getScanner() throws IOException {
     @Override
     protected boolean isValidRow(Result row) {
         Query localQuery = this.query;
-        if (localQuery != null && localQuery.getFamily() != null && localQuery.getColumn() != null) {
+        if (localQuery != null && localQuery.getWord() != null) {
             return row.containsColumn(Bytes.toBytesBinary(localQuery.getFamily()), Bytes.toBytesBinary(localQuery.getColumn()));
         }
         return true;

diff --git a/src/main/java/hrider/ui/forms/ScanDialog.java b/src/main/java/hrider/ui/forms/ScanDialog.java
@@ -152,8 +152,11 @@ public Query getQuery() {
             query.setColumn(parts[1]);
 
             query.setOperator((Operator)this.comboBoxOperator.getSelectedItem());
-            query.setWord(this.textFieldWord.getText().trim());
-            query.setWordType((ObjectType)this.comboBoxWordType.getSelectedItem());
+
+            if (!this.textFieldWord.getText().trim().isEmpty()) {
+                query.setWord(this.textFieldWord.getText().trim());
+                query.setWordType((ObjectType)this.comboBoxWordType.getSelectedItem());
+            }
 
             return query;
         }