Author: echatellier Date: 2012-02-20 17:50:14 +0100 (Mon, 20 Feb 2012) New Revision: 1433 Url: http://nuiton.org/repositories/revision/wikitty/1433 Log: #1959 : JdbcSQLException during sync engin Modified: trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java Modified: trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java =================================================================== --- trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2012-02-20 16:31:06 UTC (rev 1432) +++ trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2012-02-20 16:50:14 UTC (rev 1433) @@ -622,26 +622,33 @@ @Override public DataStatistic getDataStatistic(WikittyTransaction tx) { - DataStatistic result; + DataStatistic result = null; Connection connection = WikittyJDBCUtil.getConnection(tx, config); try { Statement statement = connection.createStatement(); ResultSet resultSet = statement.executeQuery( jdbcQuery.getProperty(QUERY_COUNT_ACTIVE_WIKITTY)); - long activeWikitties = resultSet.getLong(1); + if (resultSet.next()) { + long activeWikitties = resultSet.getLong(1); - resultSet = statement.executeQuery( - jdbcQuery.getProperty(QUERY_COUNT_DELETED_WIKITTY)); - long deletedWikitties = resultSet.getLong(1); - - result = new DataStatistic(activeWikitties, deletedWikitties); + resultSet = statement.executeQuery( + jdbcQuery.getProperty(QUERY_COUNT_DELETED_WIKITTY)); + if (resultSet.next()) { + long deletedWikitties = resultSet.getLong(1); + + result = new DataStatistic(activeWikitties, deletedWikitties); + } + } } catch (SQLException eee) { - result = new DataStatistic(); log.warn("Can't retrieve statisticn data", eee); } finally { WikittyJDBCUtil.closeQuietly(connection); } + + if (result == null) { + result = new DataStatistic(); + } return result; }