From: Lucas Werkmeister <mail@lucaswerkmeister.de>
Date: Wed, 22 Mar 2017 21:38:50 +0000 (+0100)
Subject: Merge changes Ie9951caa,I9a57ce72
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=28b216e0a027c8d82b4db179d79974bd8d3c0aff;hp=b483cf119f5b2e63ef1c406ba97c6b7c41ed5b1f

Merge changes Ie9951caa,I9a57ce72

* changes:
  fix: Typo pointed out while reviewing change 492
  chg: Make synchronization on the Database layer explicit
---

diff --git a/src/club/wpia/gigi/util/PasswordHash.java b/src/club/wpia/gigi/util/PasswordHash.java
index 7d2cb334..40700d32 100644
--- a/src/club/wpia/gigi/util/PasswordHash.java
+++ b/src/club/wpia/gigi/util/PasswordHash.java
@@ -15,7 +15,7 @@ public class PasswordHash {
      *            The hash to verify the password against.
      * @return
      *         <ul>
-     *         <li><code>null</code>, if the password was valid</li>
+     *         <li><code>null</code>, if the password was invalid</li>
      *         <li><code>hash</code>, if the password is valid and the hash
      *         doesn't need to be updated</li>
      *         <li>a new hash, if the password is valid but the hash in the
diff --git a/tests/club/wpia/gigi/testUtils/ConfiguredTest.java b/tests/club/wpia/gigi/testUtils/ConfiguredTest.java
index cdacf692..711007a0 100644
--- a/tests/club/wpia/gigi/testUtils/ConfiguredTest.java
+++ b/tests/club/wpia/gigi/testUtils/ConfiguredTest.java
@@ -93,7 +93,9 @@ public abstract class ConfiguredTest {
         if ( !DatabaseConnection.isInited()) {
             DatabaseConnection.init(testProps);
             try {
-                l = DatabaseConnection.newLink(false);
+                synchronized (ConfiguredTest.class) {
+                    l = DatabaseConnection.newLink(false);
+                }
             } catch (InterruptedException e) {
                 throw new Error(e);
             }
@@ -104,9 +106,11 @@ public abstract class ConfiguredTest {
 
     @AfterClass
     public static void closeDBLink() {
-        if (l != null) {
-            l.close();
-            l = null;
+        synchronized (ConfiguredTest.class) {
+            if (l != null) {
+                l.close();
+                l = null;
+            }
         }
     }