public static void main(String[] args) throws Exception {
Properties mainProps = new Properties();
- mainProps.load(new FileInputStream("config/gigi.properties"));
+ try (FileInputStream inStream = new FileInputStream("config/gigi.properties")) {
+ mainProps.load(inStream);
+ }
for (int i = 0; i < args.length; i++) {
if (args[i].equals("--port")) {
mainProps.setProperty("port", args[i + 1]);
try {
Statement s = getInstance().c.createStatement();
while (version < CURRENT_SCHEMA_VERSION) {
- InputStream resourceAsStream = DatabaseConnection.class.getResourceAsStream("upgrade/from_" + version + ".sql");
- if (resourceAsStream == null) {
- throw new Error("Upgrade script from version " + version + " was not found.");
+ try (InputStream resourceAsStream = DatabaseConnection.class.getResourceAsStream("upgrade/from_" + version + ".sql")) {
+ if (resourceAsStream == null) {
+ throw new Error("Upgrade script from version " + version + " was not found.");
+ }
+ SQLFileManager.addFile(s, resourceAsStream, ImportType.PRODUCTION);
}
- SQLFileManager.addFile(s, resourceAsStream, ImportType.PRODUCTION);
version++;
}
s.addBatch("INSERT INTO schemeVersion SET version='" + version + "'");
package org.cacert.gigi.dbObjects;
import java.io.IOException;
+import java.io.InputStream;
import java.net.IDN;
import java.util.Arrays;
import java.util.Collections;
private static final Set<String> IDNEnabledTLDs;
static {
Properties CPS = new Properties();
- try {
- CPS.load(Domain.class.getResourceAsStream("CPS.properties"));
+ try (InputStream resourceAsStream = Domain.class.getResourceAsStream("CPS.properties")) {
+ CPS.load(resourceAsStream);
IDNEnabledTLDs = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(CPS.getProperty("IDN-enabled").split(","))));
} catch (IOException e) {
throw new Error(e);
Attributes dnsLookup = context.getAttributes(name, new String[] {
"TXT"
});
+ context.close();
return extractTextEntries(dnsLookup.get("TXT"));
}