From 5bd25303cf731ec60d6aa2e39928158d1f0c1c70 Mon Sep 17 00:00:00 2001
From: abobrov <abobrov@localhost>
Date: Fri, 24 Aug 2007 20:29:55 +0000
Subject: [PATCH] - fix an NPE found by the entry cache concurrency test.
---
opendj-sdk/opends/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java
index 0ba3056..06842c6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java
@@ -248,8 +248,11 @@
backendMap = idMap.get(backend);
if (backendMap != null) {
SoftReference<CacheEntry> ref = backendMap.get(entryID);
- if ((ref != null) && (ref.get() != null)) {
- return ref.get().getDN();
+ if (ref != null) {
+ CacheEntry cacheEntry = ref.get();
+ if (cacheEntry != null) {
+ return cacheEntry.getDN();
+ }
}
}
return null;
--
Gitblit v1.10.0