Repository: marmotta Updated Branches: refs/heads/MARMOTTA-584 cde06ca13 -> 7c4ac5a99
MARMOTTA-584: fixed compilation error by adding new exception handling Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/7c4ac5a9 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/7c4ac5a9 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/7c4ac5a9 Branch: refs/heads/MARMOTTA-584 Commit: 7c4ac5a997b1d31910befd31f4a81c99e9425071 Parents: cde06ca Author: Sergio Fernández <[email protected]> Authored: Mon May 2 12:52:32 2016 +0200 Committer: Sergio Fernández <[email protected]> Committed: Mon May 2 12:52:32 2016 +0200 ---------------------------------------------------------------------- .../marmotta/loader/kiwi/KiWiLoaderHandler.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/7c4ac5a9/loader/marmotta-loader-kiwi/src/main/java/org/apache/marmotta/loader/kiwi/KiWiLoaderHandler.java ---------------------------------------------------------------------- diff --git a/loader/marmotta-loader-kiwi/src/main/java/org/apache/marmotta/loader/kiwi/KiWiLoaderHandler.java b/loader/marmotta-loader-kiwi/src/main/java/org/apache/marmotta/loader/kiwi/KiWiLoaderHandler.java index 87d38c0..c2df9e8 100644 --- a/loader/marmotta-loader-kiwi/src/main/java/org/apache/marmotta/loader/kiwi/KiWiLoaderHandler.java +++ b/loader/marmotta-loader-kiwi/src/main/java/org/apache/marmotta/loader/kiwi/KiWiLoaderHandler.java @@ -38,6 +38,8 @@ import org.openrdf.rio.RDFHandlerException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.sql.SQLException; + /** * Add file description here! * @@ -47,8 +49,6 @@ public class KiWiLoaderHandler implements LoaderHandler { private static Logger log = LoggerFactory.getLogger(KiWiLoaderHandler.class); - private KiWiConfiguration kiwi; - protected KiWiStore store; protected SailRepository repository; @@ -76,15 +76,13 @@ public class KiWiLoaderHandler implements LoaderHandler { log.info("Initializing KiWiLoader for {}; user: {}, password: {}", dbCon, dbUser, String.format("%"+dbPasswd.length()+"s", "*")); try { - KiWiConfiguration kiwi = new KiWiConfiguration("kiwiLoader", dbCon, dbUser, dbPasswd, getDialect(dbCon).newInstance()); + final KiWiConfiguration kiwi = new KiWiConfiguration("kiwiLoader", dbCon, dbUser, dbPasswd, getDialect(dbCon).newInstance()); store = new KiWiStore(kiwi); repository = new SailRepository(store); repository.initialize(); - - KiWiLoaderConfiguration loaderConfiguration = new KiWiLoaderConfiguration(); if(configuration.containsKey(LoaderOptions.CONTEXT)) { loaderConfiguration.setContext(configuration.getString(LoaderOptions.CONTEXT)); @@ -95,7 +93,7 @@ public class KiWiLoaderHandler implements LoaderHandler { if(kiwi.getDialect() instanceof PostgreSQLDialect) { log.info("- using PostgreSQL bulk loader ... "); loaderConfiguration.setCommitBatchSize(100000); - handler = new KiWiPostgresHandler(store,loaderConfiguration); + handler = new KiWiPostgresHandler(store, loaderConfiguration); } else if(kiwi.getDialect() instanceof MySQLDialect) { log.info("- using MySQL bulk loader ... "); loaderConfiguration.setCommitBatchSize(100000); @@ -108,9 +106,10 @@ public class KiWiLoaderHandler implements LoaderHandler { } catch (RepositoryException e) { throw new RDFHandlerException("error initialising KiWi repository",e); } catch (InstantiationException | IllegalAccessException e) { - throw new RDFHandlerException("could not instatiate KiWi dialect",e); + throw new RDFHandlerException("could not instantiate KiWi dialect",e); + } catch (SQLException e) { + throw new RDFHandlerException("error generating SQL handler query",e); } - } /**
