From 77b43a1d03725669362ff6b4740b8650770a2efb Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Sat, 25 Jan 2014 01:08:40 +0000
Subject: [PATCH] Fix various Findbugs warnings:
---
opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagementContext.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagementContext.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagementContext.java
index a75c20a..98e9a1f 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagementContext.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagementContext.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
+ * Portions copyright 2014 ForgeRock AS.
*/
package org.forgerock.opendj.config.server;
@@ -246,13 +247,7 @@
}
return pvalues;
}
- } catch (DefinitionDecodingException e) {
- throw PropertyException.defaultBehaviorException(propDef1, e);
- } catch (PropertyNotFoundException e) {
- throw PropertyException.defaultBehaviorException(propDef1, e);
- } catch (PropertyException e) {
- throw PropertyException.defaultBehaviorException(propDef1, e);
- } catch (ConfigException e) {
+ } catch (Exception e) {
throw PropertyException.defaultBehaviorException(propDef1, e);
}
}
@@ -262,7 +257,7 @@
* A definition resolver that determines the managed object definition from
* the object classes of a ConfigEntry.
*/
- private final class MyDefinitionResolver implements DefinitionResolver {
+ private static final class MyDefinitionResolver implements DefinitionResolver {
// The config entry.
private final Entry entry;
@@ -608,7 +603,7 @@
// Get the configuration entry.
DN targetDN = DNBuilder.create(path);
try {
- return (getManagedObjectConfigEntry(targetDN) != null);
+ return (configRepository.getEntry(targetDN) != null);
} catch (ConfigException e) {
// Assume it doesn't exist.
return false;
--
Gitblit v1.10.0