From: Felix Dörre Date: Tue, 3 Nov 2015 20:52:39 +0000 (+0100) Subject: fix: coverity fixes X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=41a647e1c20b5182928e9d2178693aa943e56146 fix: coverity fixes --- diff --git a/src/org/cacert/gigi/dbObjects/Job.java b/src/org/cacert/gigi/dbObjects/Job.java index c02a0467..9104c131 100644 --- a/src/org/cacert/gigi/dbObjects/Job.java +++ b/src/org/cacert/gigi/dbObjects/Job.java @@ -30,7 +30,7 @@ public class Job implements IdCachable { } } - public static Job sign(Certificate targetId, Date start, String period) throws GigiApiException { + public synchronized static Job sign(Certificate targetId, Date start, String period) throws GigiApiException { CertificateValiditySelector.checkValidityLength(period); GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("INSERT INTO `jobs` SET targetId=?, task=?::`jobType`, executeFrom=?, executeTo=?"); ps.setInt(1, targetId.getId()); diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateRequest.java b/src/org/cacert/gigi/pages/account/certs/CertificateRequest.java index dae44fa0..e8a53df0 100644 --- a/src/org/cacert/gigi/pages/account/certs/CertificateRequest.java +++ b/src/org/cacert/gigi/pages/account/certs/CertificateRequest.java @@ -283,7 +283,7 @@ public class CertificateRequest { return name; } - public String getOu() { + public synchronized String getOu() { if (ctx.getTarget() instanceof Organisation) { return ou; } diff --git a/tests/org/cacert/gigi/TestCertificate.java b/tests/org/cacert/gigi/TestCertificate.java index 9a8955e0..2f5dd747 100644 --- a/tests/org/cacert/gigi/TestCertificate.java +++ b/tests/org/cacert/gigi/TestCertificate.java @@ -75,6 +75,7 @@ public class TestCertificate extends ManagedTest { testFails(CertificateStatus.ISSUED, c); Certificate c2 = Certificate.getBySerial(c.getSerial()); + assertNotNull(c2); assertEquals(2, c2.getSANs().size()); assertEquals(c.getSANs().get(0).getName(), c2.getSANs().get(0).getName()); assertEquals(c.getSANs().get(0).getType(), c2.getSANs().get(0).getType()); diff --git a/tests/org/cacert/gigi/TestDomain.java b/tests/org/cacert/gigi/TestDomain.java index a833cd91..6a9599a0 100644 --- a/tests/org/cacert/gigi/TestDomain.java +++ b/tests/org/cacert/gigi/TestDomain.java @@ -28,7 +28,7 @@ public class TestDomain extends ManagedTest { assertNotEquals(0, d.getId()); assertEquals(d.getId(), domains[0].getId()); - Domain d2 = new Domain(us, "v2-example.org"); + new Domain(us, "v2-example.org"); domains = us.getDomains(); assertEquals(2, domains.length); @@ -48,9 +48,9 @@ public class TestDomain extends ManagedTest { @Test public void testDoubleDomain() throws InterruptedException, GigiApiException { - Domain d = new Domain(us, "dub-example.org"); + new Domain(us, "dub-example.org"); try { - Domain d2 = new Domain(us, "dub-example.org"); + new Domain(us, "dub-example.org"); fail("expected exception"); } catch (GigiApiException e) { // expected @@ -61,7 +61,7 @@ public class TestDomain extends ManagedTest { public void testDoubleDomainDelete() throws InterruptedException, GigiApiException { Domain d = new Domain(us, "delexample.org"); d.delete(); - Domain d2 = new Domain(us, "delexample.org"); + new Domain(us, "delexample.org"); } } diff --git a/tests/org/cacert/gigi/TestUser.java b/tests/org/cacert/gigi/TestUser.java index e276fddf..2bf1c941 100644 --- a/tests/org/cacert/gigi/TestUser.java +++ b/tests/org/cacert/gigi/TestUser.java @@ -121,7 +121,7 @@ public class TestUser extends ManagedTest { @Test public void testNoCats() { String email = createUniqueName() + "a@email.org"; - int id = createVerifiedUser("aä", "b", email, TEST_PASSWORD); + createVerifiedUser("aä", "b", email, TEST_PASSWORD); User emailUser = User.getByEmail(email); assertFalse(emailUser.hasPassedCATS()); }