From b6644c452624e2de72d7ddf37b1603de887a26a0 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Mon, 21 Jan 2008 12:10:39 +0000
Subject: [PATCH] Fix issues 2831 and 1948.
---
opends/src/server/org/opends/server/backends/jeb/ImportJob.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/jeb/ImportJob.java b/opends/src/server/org/opends/server/backends/jeb/ImportJob.java
index ebafd98..c9f3967 100644
--- a/opends/src/server/org/opends/server/backends/jeb/ImportJob.java
+++ b/opends/src/server/org/opends/server/backends/jeb/ImportJob.java
@@ -124,7 +124,7 @@
/**
* The number of merge passes.
*/
- int mergePassNumber = 1;
+ private int mergePassNumber = 1;
/**
@@ -235,8 +235,9 @@
startTime = System.currentTimeMillis();
// Create a temporary work directory.
- File tempDir = getFileForPath(config.getImportTempDirectory());
- if(!tempDir.exists() && !tempDir.mkdir())
+ File parentDir = getFileForPath(config.getImportTempDirectory());
+ File tempDir = new File(parentDir, config.getBackendId());
+ if(!tempDir.exists() && !tempDir.mkdirs())
{
Message msg = ERR_JEB_IMPORT_CREATE_TMPDIR_ERROR.get(
String.valueOf(tempDir));
@@ -828,7 +829,7 @@
* @throws DatabaseException If an error occurs in the JE database.
* @throws JebException If an error occurs in the JE backend.
*/
- public void processEntry(ImportContext importContext, Entry entry)
+ private void processEntry(ImportContext importContext, Entry entry)
throws JebException, DatabaseException
{
DN entryDN = entry.getDN();
@@ -963,7 +964,7 @@
if (txn != null)
{
- importContext.getEntryContainer().transactionCommit(txn);
+ EntryContainer.transactionCommit(txn);
txn = null;
}
}
@@ -971,7 +972,7 @@
{
if (txn != null)
{
- importContext.getEntryContainer().transactionAbort(txn);
+ EntryContainer.transactionAbort(txn);
}
}
}
@@ -1215,7 +1216,7 @@
/**
* This class reports progress of the import job at fixed intervals.
*/
- class ProgressTask extends TimerTask
+ private final class ProgressTask extends TimerTask
{
/**
* The number of entries that had been read at the time of the
--
Gitblit v1.10.0