From 1afeb00abfb007ef9322d2060896353aeb3efdc4 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 30 May 2016 10:43:11 +0000
Subject: [PATCH] OPENDJ-2987 Fix all classes that need to use ObjectClass placeholder instead of null

---
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java
index 34215f5..c887f22 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java
@@ -110,16 +110,13 @@
   protected void objectClassSelected(JList<?> list)
   {
     String o = (String)list.getSelectedValue();
-    if (o != null)
+    Schema schema = getInfo().getServerDescriptor().getSchema();
+    if (o != null && schema != null)
     {
-      Schema schema = getInfo().getServerDescriptor().getSchema();
-      if (schema != null)
+      ObjectClass oc = schema.getObjectClass(o.toLowerCase());
+      if (!oc.isPlaceHolder())
       {
-        ObjectClass oc = schema.getObjectClass(o.toLowerCase());
-        if (oc != null)
-        {
-          notifySchemaSelectionListeners(oc);
-        }
+        notifySchemaSelectionListeners(oc);
       }
     }
   }

--
Gitblit v1.10.0