From 47be44124da7f6ad42bed03a24701ca07c00918d Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Wed, 12 Sep 2007 00:03:02 +0000
Subject: [PATCH] Make a couple of changes to help improve server performance:
---
opends/src/server/org/opends/server/extensions/CryptPasswordStorageScheme.java | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/CryptPasswordStorageScheme.java b/opends/src/server/org/opends/server/extensions/CryptPasswordStorageScheme.java
index c4095ec..1f0e144 100644
--- a/opends/src/server/org/opends/server/extensions/CryptPasswordStorageScheme.java
+++ b/opends/src/server/org/opends/server/extensions/CryptPasswordStorageScheme.java
@@ -30,7 +30,6 @@
import java.util.Arrays;
import java.util.Random;
-import java.util.concurrent.locks.ReentrantLock;
import org.opends.messages.Message;
import org.opends.server.admin.std.server.CryptPasswordStorageSchemeCfg;
@@ -76,7 +75,7 @@
+"ABCDEFGHIJKLMNOPQRSTUVWXYZ").getBytes();
private final Random randomSaltIndex = new Random();
- private final ReentrantLock saltLock = new ReentrantLock();
+ private final Object saltLock = new Object();
private final Crypt crypt = new Crypt();
@@ -144,9 +143,8 @@
* @return a random 2-byte salt
*/
private byte[] randomSalt() {
- saltLock.lock();
-
- try {
+ synchronized (saltLock)
+ {
byte[] salt = new byte[2];
int sb1 = randomSaltIndex.nextInt(SALT_CHARS.length);
int sb2 = randomSaltIndex.nextInt(SALT_CHARS.length);
@@ -154,8 +152,6 @@
salt[1] = SALT_CHARS[sb2];
return salt;
- } finally {
- saltLock.unlock();
}
}
--
Gitblit v1.10.0