From e54a2046c8f4a385e42d0ce899d1761a2753d401 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 06 Nov 2014 15:25:24 +0000
Subject: [PATCH] OPENDJ-1624 NullPointerException while doing status with authentication

---
 opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
index 7a4a51a..f86e06d 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
@@ -2509,6 +2509,8 @@
           }
           catch (Throwable t2)
           {
+            // Cannot convert it, just return it
+            return o;
           }
         }
       }

--
Gitblit v1.10.0