From b1f2a44e743fa8c2525e0f232d3cc83d1afe248c Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 06 Jan 2010 22:00:33 +0000
Subject: [PATCH] Fix a NullPointerException that occurs in the 'Manage Schema' dialog of the control panel when a syntax has no name (and only has an OID).
---
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java
index 0a9a5ca..417c926 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.ui.renderer;
@@ -63,11 +63,15 @@
{
if (value instanceof AttributeSyntax)
{
- value = ((AttributeSyntax)value).getSyntaxName();
- if (value == null)
+ String syntaxName = ((AttributeSyntax)value).getSyntaxName();
+ if (syntaxName == null)
{
value = ((AttributeSyntax)value).getOID();
}
+ else
+ {
+ value = syntaxName;
+ }
}
else if (value instanceof CommonSchemaElements)
{
--
Gitblit v1.10.0