X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FdbObjects%2FDomain.java;h=9df2e4822c7f33eae8cc8f1003011e8a44078c4e;hb=14ce2292d15b5d43a285804991f9b7d94207e274;hp=c29d9b2ba00adbdede5721c04571f399bd5494c1;hpb=8538ec7dc66070297f25c1a5f23bdf188c325229;p=gigi.git diff --git a/src/org/cacert/gigi/dbObjects/Domain.java b/src/org/cacert/gigi/dbObjects/Domain.java index c29d9b2b..9df2e482 100644 --- a/src/org/cacert/gigi/dbObjects/Domain.java +++ b/src/org/cacert/gigi/dbObjects/Domain.java @@ -1,6 +1,7 @@ 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; @@ -70,8 +71,8 @@ public class Domain implements IdCachable { private static final Set 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); @@ -168,10 +169,10 @@ public class Domain implements IdCachable { } public void insert() throws GigiApiException { - if (id != 0) { - throw new GigiApiException("already inserted."); - } synchronized (Domain.class) { + if (id != 0) { + throw new GigiApiException("already inserted."); + } checkInsert(suffix); GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO `domains` SET memid=?, domain=?"); ps.setInt(1, owner.getId());