From 52bf90ac750b56e2b95b52860a366594e7bd08ba Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Thu, 20 Jan 2011 18:05:44 +0000
Subject: [PATCH] Code cleanup removing potential issues detected by FindBugs
---
opendj-sdk/opends/src/server/org/opends/server/admin/ManagedObjectPath.java | 3 ++-
opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliGlobalAdmin.java | 10 +++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/admin/ManagedObjectPath.java b/opendj-sdk/opends/src/server/org/opends/server/admin/ManagedObjectPath.java
index 568b89c..91529d6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/admin/ManagedObjectPath.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/admin/ManagedObjectPath.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.admin;
@@ -875,7 +876,7 @@
InstantiableRelationDefinition<? super C, ? super S> ir =
(InstantiableRelationDefinition<? super C, ? super S>) r;
if (elements.size() == 0) {
- return parent().child(ir, nd, null);
+ return parent().child(ir, nd, "null");
} else {
return parent().child(ir, nd,
elements.get(elements.size() - 1).getName());
diff --git a/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliGlobalAdmin.java b/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliGlobalAdmin.java
index 9212cd1..886ec2c 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliGlobalAdmin.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliGlobalAdmin.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2007-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.admin.client.cli;
@@ -601,8 +602,7 @@
}
table.startRow();
table.appendCell(adminUserProp.getAttributeName());
- table.appendCell(getPropertyOptionSummary(userAdminProperties
- .get(adminUserProp)));
+ table.appendCell(getPropertyOptionSummary(adminUserProp));
table.appendCell(adminUserProp.getAttributeSyntax());
if (userAdminProperties.get(adminUserProp).getDefaultValue() != null)
{
@@ -823,12 +823,12 @@
}
//Compute the options field.
- private String getPropertyOptionSummary(Argument arg)
+ private String getPropertyOptionSummary(AdministratorProperty adminUserProp)
{
+ Argument arg = userAdminProperties.get(adminUserProp);
StringBuilder b = new StringBuilder();
- if (readonlyadminUserProperties.contains(
- ADSContext.getServerPropFromName(arg.getName())))
+ if (readonlyadminUserProperties.contains(adminUserProp))
{
b.append("r-"); //$NON-NLS-1$
}
--
Gitblit v1.10.0