From 5e98eaa34075c9c03f62da343c5986dd05fb0800 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Tue, 22 Dec 2015 15:17:05 +0000
Subject: [PATCH] OPENDJ-2572 - with OEM version, JE node displayed in Monitoring > General Information Make the JE Node visible only when we detect that we're not running the OEM version (i.e. the JE backend class is available). Avoid code duplication with upgrade, moving the isOEMVersion() and isClassAvailable() methods to server's StaticUtils.
---
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java | 19 +------------------
1 files changed, 1 insertions(+), 18 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java
index 1f0b881..90df973 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java
@@ -33,6 +33,7 @@
import static org.opends.server.tools.upgrade.FileManager.copy;
import static org.opends.server.tools.upgrade.Installation.CURRENT_CONFIG_FILE_NAME;
import static org.opends.server.tools.upgrade.UpgradeUtils.*;
+import static org.opends.server.util.StaticUtils.isClassAvailable;
import java.io.File;
import java.io.IOException;
@@ -1021,24 +1022,6 @@
};
}
- static boolean isOEMVersion()
- {
- return !isClassAvailable("org.opends.server.backends.jeb.JEBackend");
- }
-
- private static boolean isClassAvailable(final String className)
- {
- try
- {
- Class.forName(className);
- return true;
- }
- catch (Exception e)
- {
- return false;
- }
- }
-
/** This inner classes causes JE to be lazily linked and prevents runtime errors if JE is not in the classpath. */
static final class JEHelper {
private static ClientException clientException(final File backendDirectory, final DatabaseException e) {
--
Gitblit v1.10.0