From 134f26626acf0f76f0e999875f3c5a90c7b16034 Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <yannick.lecaillez@forgerock.com>
Date: Thu, 30 Jun 2016 08:47:04 +0000
Subject: [PATCH] OPENDJ-3171: rebuild-index/importer are killed on low-memory configuration.
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
index 4c65bec..517e3b0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
@@ -654,7 +654,7 @@
}
rootContainer = newRootContainer(AccessMode.READ_WRITE);
rootContainer.getStorage().close();
- return getImportStrategy(serverContext, rootContainer).importLDIF(importConfig);
+ return getImportStrategy(rootContainer).importLDIF(importConfig);
}
catch (StorageRuntimeException e)
{
@@ -696,9 +696,9 @@
}
}
- private ImportStrategy getImportStrategy(ServerContext serverContext, RootContainer rootContainer)
+ private ImportStrategy getImportStrategy(RootContainer rootContainer)
{
- return new OnDiskMergeImporter.StrategyImpl(serverContext, rootContainer, cfg);
+ return new OnDiskMergeImporter.StrategyImpl(rootContainer, cfg);
}
@Override
@@ -769,7 +769,7 @@
{
rootContainer = newRootContainer(AccessMode.READ_WRITE);
}
- getImportStrategy(serverContext, rootContainer).rebuildIndex(rebuildConfig);
+ getImportStrategy(rootContainer).rebuildIndex(rebuildConfig);
}
catch (ConfigException ce)
{
--
Gitblit v1.10.0