Initialize variables in shared static this()

vibe-d · Jul 13, 2017 · 9bfcf9b · 9bfcf9b
1 parent e79c871
commit 9bfcf9b
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/mongodb/vibe/db/mongo/sasl.d b/mongodb/vibe/db/mongo/sasl.d
@@ -20,7 +20,12 @@ import vibe.crypto.cryptorand;
 
 @safe:
 
-private SHA1HashMixerRNG g_rng;
+private SHA1HashMixerRNG g_rng()
+{
+	static SHA1HashMixerRNG m_rng;
+	if (!m_rng) m_rng = new SHA1HashMixerRNG;
+	return m_rng;
+}
 
 package struct ScramState
 {
@@ -150,8 +155,3 @@ private DigestType!SHA1 pbkdf2(const ubyte[] password, const ubyte[] salt, int i
 	}
 	return current;
 }
-
-static this()
-{
-	g_rng = new SHA1HashMixerRNG();
-}