fix: coverity fixes

diff --git a/src/org/cacert/gigi/dbObjects/Job.java b/src/org/cacert/gigi/dbObjects/Job.java
index c02a0467a79e73a1b589ad6cb56ad149366d6ff6..9104c1315a5d18537893149a342c326be6888c92 100644 (file)
--- 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());
         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 dae44fa0f8081f0b81c72df2b09bf37917e3af50..e8a53df03449e6e07fcb6d5e1b51820927220872 100644 (file)
--- 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;
     }
 
         return name;
     }
 

-    public String getOu() {
+    public synchronized String getOu() {

         if (ctx.getTarget() instanceof Organisation) {
             return ou;
         }
         if (ctx.getTarget() instanceof Organisation) {
             return ou;
         }

diff --git a/tests/org/cacert/gigi/TestCertificate.java b/tests/org/cacert/gigi/TestCertificate.java
index 9a8955e03439b89b1dd9f9d46ce8b329717020d3..2f5dd747fbc0852e6a16ed10222a89ec70356ac6 100644 (file)
--- 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());
         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());
         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 a833cd91c83e73a7d5e036e1b5fa3766eb43347f..6a9599a0daec9c0f65dc9e8c5613592b81bf27c9 100644 (file)
--- 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());
 
         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);
 
         domains = us.getDomains();
         assertEquals(2, domains.length);


@@ -48,9 +48,9 @@ public class TestDomain extends ManagedTest {
 
     @Test
     public void testDoubleDomain() throws InterruptedException, GigiApiException {
 
     @Test
     public void testDoubleDomain() throws InterruptedException, GigiApiException {

-        Domain d = new Domain(us, "dub-example.org");
+        new Domain(us, "dub-example.org");

         try {
         try {

-            Domain d2 = new Domain(us, "dub-example.org");
+            new Domain(us, "dub-example.org");

             fail("expected exception");
         } catch (GigiApiException e) {
             // expected
             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();
     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 e276fddf68a57c6b3f8efa1c484c01d4e92b690d..2bf1c941b9f16f600621493614ff26f9ef29c2e0 100644 (file)
--- 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";
     @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());
     }
         User emailUser = User.getByEmail(email);
         assertFalse(emailUser.hasPassedCATS());
     }