Removes null bytes from tweet text and unused brandchecker

1 files changed, 18 insertions, 14 deletions

diff --git a/src/main/Main.java b/src/main/Main.java
index 43e5619..7ea6bc3 100644
--- a/src/main/Main.java
+++ b/src/main/Main.java
@@ -117,23 +117,27 @@ public class Main implements Callable<Boolean> {
             /* create the object that fills the database */
             DataFiller filler = new DataFiller(connection);
             while ((tweet = reader.getTweet()) != null) {
-                filler.processTweet(tweet);
-                ++tweetNo;
+                try {
+                    filler.processTweet(tweet);
+                    ++tweetNo;
+                } catch (JsonParseException ex) {
+                    if (tweet != null) {
+                        System.err.println("Faulty tweet " + tweetNo + ": " + tweet);
+                    }
+                    Logger.getLogger(Main.class.getName()).log(Level.SEVERE,
+                            "Tweet read error", ex);
+                } catch (SQLException ex) {
+                    if (tweet != null) {
+                        System.err.println("Faulty tweet " + tweetNo + ": " + tweet);
+                    }
+                    Logger.getLogger(Main.class.getName()).log(Level.SEVERE,
+                            "DB error", ex);
+                }
             }
             return true;
-        } catch (JsonParseException | IOException ex) {
-            if (tweet != null) {
-                System.err.println("Faulty tweet " + tweetNo + ": " + tweet);
-            }
-            Logger.getLogger(Main.class.getName()).log(Level.SEVERE,
-                    "Tweet read error", ex);
         } catch (SQLException ex) {
-            if (tweet != null) {
-                System.err.println("Faulty tweet " + tweetNo + ": " + tweet);
-            }
-            Logger.getLogger(Main.class.getName()).log(Level.SEVERE,
-                    "DB error", ex);
-        }
+            Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
+        } 
         return false;
     }