From b69fcf34c8df9c78da2a9740ddd93d60a11a38e7 Mon Sep 17 00:00:00 2001
From: Chris Ridd <chris.ridd@forgerock.com>
Date: Mon, 29 Oct 2012 14:59:32 +0000
Subject: [PATCH] Fix OPENDJ-582 Null pointer exception when importing an entry with reference to a non existing password policy

---
 opends/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/opends/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java b/opends/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java
index 6635894..a0403db 100644
--- a/opends/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java
+++ b/opends/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java
@@ -23,7 +23,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions copyright 2011 ForgeRock AS.
+ *      Portions copyright 2011-2012 ForgeRock AS.
  */
 package org.opends.server.plugins;
 
@@ -376,8 +376,7 @@
                   String.valueOf(entry.getDN()), String.valueOf(policyDN));
               logError(message);
             }
-
-            if (authPolicy.isPasswordPolicy())
+            else if (authPolicy.isPasswordPolicy())
             {
               policy = (PasswordPolicy) authPolicy;
             }

--
Gitblit v1.10.0