Fix: various coverity charset issues.

[gigi.git] / util / org / cacert / gigi / util / DatabaseManager.java

diff --git a/util/org/cacert/gigi/util/DatabaseManager.java b/util/org/cacert/gigi/util/DatabaseManager.java
index 891be0f44ebdb5382974b9c6bdae6b8433675611..84c012c3586a55d564e43d747dd7a61528ce6c26 100644 (file)
--- a/util/org/cacert/gigi/util/DatabaseManager.java
+++ b/util/org/cacert/gigi/util/DatabaseManager.java
@@ -2,8 +2,10 @@ package org.cacert.gigi.util;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileReader;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
@@ -26,7 +28,9 @@ public class DatabaseManager {
         }
         if (args.length == 0) {
             Properties p = new Properties();
-            p.load(new FileReader("config/gigi.properties"));
+            try (Reader reader = new InputStreamReader(new FileInputStream("config/gigi.properties"), "UTF-8")) {
+                p.load(reader);
+            }
             args = new String[] {
                     p.getProperty("sql.driver"), p.getProperty("sql.url"), p.getProperty("sql.user"), p.getProperty("sql.password")
             };
@@ -43,14 +47,20 @@ public class DatabaseManager {
         Connection conn = DriverManager.getConnection(args[1], args[2], args[3]);
         conn.setAutoCommit(false);
         Statement stmt = conn.createStatement();
-        SQLFileManager.addFile(stmt, DatabaseConnection.class.getResourceAsStream("tableStructure.sql"), truncate);
+        try (InputStream structure = DatabaseConnection.class.getResourceAsStream("tableStructure.sql")) {
+            SQLFileManager.addFile(stmt, structure, truncate);
+        }
         File localData = new File("doc/sampleData.sql");
         if (localData.exists()) {
-            SQLFileManager.addFile(stmt, new FileInputStream(localData), ImportType.PRODUCTION);
+            try (FileInputStream f = new FileInputStream(localData)) {
+                SQLFileManager.addFile(stmt, f, ImportType.PRODUCTION);
+            }
         }
         stmt.executeBatch();
         conn.commit();
         stmt.close();
+
+        conn.close();
     }
 
 }