From c082d381d318721051b7ebac5c85ad9ef61969b1 Mon Sep 17 00:00:00 2001 From: Maurice Laveaux Date: Mon, 2 Jun 2014 11:55:28 +0200 Subject: Reverted the hacky try-catch fix --- src/main/Main.java | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/src/main/Main.java b/src/main/Main.java index 7ea6bc3..5338003 100644 --- a/src/main/Main.java +++ b/src/main/Main.java @@ -117,27 +117,23 @@ public class Main implements Callable { /* create the object that fills the database */ DataFiller filler = new DataFiller(connection); while ((tweet = reader.getTweet()) != null) { - 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); - } + filler.processTweet(tweet); + ++tweetNo; } return true; + } 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) { - Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex); - } + if (tweet != null) { + System.err.println("Faulty tweet " + tweetNo + ": " + tweet); + } + Logger.getLogger(Main.class.getName()).log(Level.SEVERE, + "DB error", ex); + } return false; } -- cgit v1.2.1