From 23cf07c2c64ba72f59b3257b9b91f4c8814b05ce Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Mon, 16 May 2011 16:29:37 +0000
Subject: [PATCH] Fix for Issue OPENDJ-151 - Resolve a couple of potential issues raised by FindBugs.
---
opends/src/server/org/opends/server/backends/LDIFBackend.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/LDIFBackend.java b/opends/src/server/org/opends/server/backends/LDIFBackend.java
index 761a3b9..6f19225 100644
--- a/opends/src/server/org/opends/server/backends/LDIFBackend.java
+++ b/opends/src/server/org/opends/server/backends/LDIFBackend.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2007-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.backends;
@@ -637,19 +638,21 @@
else
{
DN matchedDN = null;
- // BUG: parentDN can be null when entering the loop
- while (true)
+ if (parentDN != null)
{
- parentDN = parentDN.getParentDNInSuffix();
- if (parentDN == null)
+ while (true)
{
- break;
- }
+ parentDN = parentDN.getParentDNInSuffix();
+ if (parentDN == null)
+ {
+ break;
+ }
- if (entryMap.containsKey(parentDN))
- {
- matchedDN = parentDN;
- break;
+ if (entryMap.containsKey(parentDN))
+ {
+ matchedDN = parentDN;
+ break;
+ }
}
}
--
Gitblit v1.10.0