Author: bpoussin Date: 2010-06-02 20:26:31 +0200 (Wed, 02 Jun 2010) New Revision: 85 Url: http://nuiton.org/repositories/revision/wikitty/85 Log: il faut faire la creation de table dans une autre connexion que le select echoue Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2010-06-02 17:31:16 UTC (rev 84) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2010-06-02 18:26:31 UTC (rev 85) @@ -104,17 +104,18 @@ throw new WikittyException(eee); } - Connection connection = getJDBCConnection(conf); + Connection connectionTest = getJDBCConnection(conf); try { // If test of existance work, no exception and do nothing // if exception try to create databse - Statement statementTest = connection.createStatement(); + Statement statementTest = connectionTest.createStatement(); statementTest.execute(conf.getProperty(QUERY_CREATION_EXTENSION_ADMIN_TEST)); statementTest.execute(conf.getProperty(QUERY_CREATION_EXTENSION_DATA_TEST)); } catch(SQLException silentError) { if (log.isInfoEnabled()) { log.info("try to create extension database"); } + Connection connection = getJDBCConnection(conf); try { Statement statement = connection.createStatement(); statement.execute(conf.getProperty(QUERY_CREATION_EXTENSION_ADMIN)); @@ -123,9 +124,11 @@ } catch (SQLException eee) { rollbackJDBCConnection(connection); throw new WikittyException(eee); + } finally { + WikittyJDBCUtil.closeQuietly(connection); } } finally { - WikittyJDBCUtil.closeQuietly(connection); + WikittyJDBCUtil.closeQuietly(connectionTest); } } Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2010-06-02 17:31:16 UTC (rev 84) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2010-06-02 18:26:31 UTC (rev 85) @@ -119,17 +119,18 @@ throw new WikittyException(eee); } - Connection connection = getJDBCConnection(conf); + Connection connectionTest = getJDBCConnection(conf); try { // If test of existance work, no exception and do nothing // if exception try to create databse - Statement statementTest = connection.createStatement(); + Statement statementTest = connectionTest.createStatement(); statementTest.execute(conf.getProperty(QUERY_CREATION_WIKITTY_ADMIN_TEST)); statementTest.execute(conf.getProperty(QUERY_CREATION_WIKITTY_DATA_TEST)); } catch (SQLException silentError) { if (log.isInfoEnabled()) { log.info("try to create wikitty database"); } + Connection connection = getJDBCConnection(conf); try { Statement statement = connection.createStatement(); statement.execute(conf.getProperty(QUERY_CREATION_WIKITTY_ADMIN)); @@ -138,9 +139,11 @@ } catch (SQLException eee) { rollbackJDBCConnection(connection); throw new WikittyException(eee); + } finally { + WikittyJDBCUtil.closeQuietly(connection); } } finally { - WikittyJDBCUtil.closeQuietly(connection); + WikittyJDBCUtil.closeQuietly(connectionTest); } }