From a1c1175fa2a9c53211d8f4d81a6c1e090428e454 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Fri, 21 Jan 2011 08:43:05 +0000
Subject: [PATCH] Code cleanup removing potential issues detected by FindBugs
---
opends/src/server/org/opends/server/tools/dsconfig/HelpSubCommandHandler.java | 3 ++-
opends/src/server/org/opends/server/tools/dsconfig/SubCommandHandler.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/dsconfig/HelpSubCommandHandler.java b/opends/src/server/org/opends/server/tools/dsconfig/HelpSubCommandHandler.java
index f04fda8..5c6daf0 100644
--- a/opends/src/server/org/opends/server/tools/dsconfig/HelpSubCommandHandler.java
+++ b/opends/src/server/org/opends/server/tools/dsconfig/HelpSubCommandHandler.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2007-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.tools.dsconfig;
@@ -800,7 +801,7 @@
// Get the tag mapping, creating it if necessary.
for (Tag tag : d.getAllTags()) {
- subTypes = tagMap.get(baseName);
+ subTypes = tagMap.get(tag);
if (subTypes == null) {
subTypes = new TreeMap<String, AbstractManagedObjectDefinition<?, ?>>();
tagMap.put(tag, subTypes);
diff --git a/opends/src/server/org/opends/server/tools/dsconfig/SubCommandHandler.java b/opends/src/server/org/opends/server/tools/dsconfig/SubCommandHandler.java
index 22e7dfe..c5ccfa6 100644
--- a/opends/src/server/org/opends/server/tools/dsconfig/SubCommandHandler.java
+++ b/opends/src/server/org/opends/server/tools/dsconfig/SubCommandHandler.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.tools.dsconfig;
@@ -1257,7 +1258,7 @@
catch (Throwable t)
{
// Bug
- new RuntimeException("Unexpected exception: "+t, t);
+ throw new RuntimeException("Unexpected exception: "+t, t);
}
return MenuResult.success(children.get(children.firstKey()));
} else {
--
Gitblit v1.10.0