From 25a8a5ac452a0788db111f1458097dbce338d6df Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 26 Mar 2015 16:06:12 +0000
Subject: [PATCH] Fix checkstyle for r11987
---
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/RootContainer.java | 6 ++++--
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java | 4 ++--
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java | 3 ++-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java
index 7740f75..a8a9ccf 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java
@@ -119,7 +119,6 @@
*
* @param cfg The configuration of this backend.
* @param serverContext The server context for this instance
- *
* @throws ConfigException
* If there is an error in the configuration.
*/
@@ -141,7 +140,6 @@
* reasons that the provided
* configuration is not acceptable.
* @param serverContext this Directory Server instance's server context
- *
* @return {@code true} if the provided configuration is acceptable
* for this backend, or {@code false} if not.
*/
@@ -673,6 +671,8 @@
*
* @param rebuildConfig
* The rebuild configuration.
+ * @param serverContext
+ * The server context for this instance
* @throws ConfigException
* If an unrecoverable problem arises during initialization.
* @throws InitializationException
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
index eb2be4a..20c0999 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
@@ -788,7 +788,8 @@
{
rootContainer = initializeRootContainer();
}
- final Importer importer = new Importer(rebuildConfig, (PersistitBackendCfg) cfg, serverContext); // FIXME JNR remove cast
+ // FIXME JNR remove cast
+ final Importer importer = new Importer(rebuildConfig, (PersistitBackendCfg) cfg, serverContext);
importer.rebuildIndexes(rootContainer);
}
catch (ExecutionException execEx)
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/RootContainer.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/RootContainer.java
index c13937e..0c7584c 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/RootContainer.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/RootContainer.java
@@ -314,11 +314,13 @@
timerService.awaitTermination(20, TimeUnit.SECONDS);
}
- private LDIFImportResult importLDIFWithOnDiskMerge(final LDIFImportConfig importConfig, ServerContext serverContext) throws DirectoryException
+ private LDIFImportResult importLDIFWithOnDiskMerge(final LDIFImportConfig importConfig, ServerContext serverContext)
+ throws DirectoryException
{
try
{
- final Importer importer = new Importer(importConfig, (PersistitBackendCfg) config, serverContext); // TODO JNR remove cast
+ // TODO JNR remove cast
+ final Importer importer = new Importer(importConfig, (PersistitBackendCfg) config, serverContext);
return importer.processImport(this);
}
catch (DirectoryException e)
--
Gitblit v1.10.0