Reject commits without keywords

2 files changed, 16 insertions, 1 deletions

diff --git a/src/io/StreamImpl.java b/src/io/StreamImpl.java
index 27b07c2..3e432bf 100644
--- a/src/io/StreamImpl.java
+++ b/src/io/StreamImpl.java
@@ -119,6 +119,10 @@ public class StreamImpl implements Stream {
                 && workerContainer.getWorker().getKeywords().equals(keywordsStr)) {
             return;
         }
+        // a query is required.
+        if (keywords.isEmpty()) {
+            return;
+        }
         /* connect (or reconnect) after setting new keywords */
         disconnect();
         Worker worker = new Worker(keywordsStr);
diff --git a/src/main/TweetShell.java b/src/main/TweetShell.java
index a0cfec6..1d03efb 100644
--- a/src/main/TweetShell.java
+++ b/src/main/TweetShell.java
@@ -253,7 +253,18 @@ public class TweetShell implements TwitterApi.PinSupplier {
                 }
                 break;
             case commit:
-                getStream().commit();
+                if (getStream().getKeywords(false).isEmpty()) {
+                    if (getStream().getKeywords(true).isEmpty()) {
+                        System.err.println("Add at least one keyword with 'add'");
+                    } else {
+                        System.err.println("No keywords are available, the "
+                                + "stream will stay open. Stop streaming with "
+                                + "the 'close' command or add new keywords "
+                                + "with 'add'.");
+                    }
+                } else {
+                    getStream().commit();
+                }
                 break;
             case status:
                 TweetCounter tc;