From 88b5935e25fae6d6b65e4a43e151a546d0bc8787 Mon Sep 17 00:00:00 2001
From: david_page <david_page@localhost>
Date: Wed, 10 Oct 2007 16:38:28 +0000
Subject: [PATCH] issue 466 (partial) remove redundant server property BACKUP_PROPERTY_CIPHER_ALGORITHM The cipher algorithm used is encoded in the backup data prologue.
---
opends/src/server/org/opends/server/backends/jeb/BackupManager.java | 21 ++++++---------------
1 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/jeb/BackupManager.java b/opends/src/server/org/opends/server/backends/jeb/BackupManager.java
index ff97b2f..24afa97 100644
--- a/opends/src/server/org/opends/server/backends/jeb/BackupManager.java
+++ b/opends/src/server/org/opends/server/backends/jeb/BackupManager.java
@@ -342,15 +342,12 @@
// output stream.
if (encrypt)
{
- String cipherAlgorithm = cryptoManager.getPreferredCipherTransformation();
- backupProperties.put(BACKUP_PROPERTY_CIPHER_ALGORITHM, cipherAlgorithm);
-
try
{
outputStream
= cryptoManager.getCipherOutputStream(outputStream);
}
- catch (Exception e)
+ catch (CryptoManager.CryptoManagerException e)
{
if (debugEnabled())
{
@@ -358,7 +355,7 @@
}
Message message = ERR_JEB_BACKUP_CANNOT_GET_CIPHER.get(
- cipherAlgorithm, stackTraceToSingleLineString(e));
+ e.getMessage());
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
message, e);
}
@@ -975,14 +972,11 @@
// input stream.
if (encrypt)
{
- String cipherAlgorithm =
- backupProperties.get(BACKUP_PROPERTY_CIPHER_ALGORITHM);
-
try
{
inputStream = cryptoManager.getCipherInputStream(inputStream);
}
- catch (Exception e)
+ catch (CryptoManager.CryptoManagerException e)
{
if (debugEnabled())
{
@@ -990,7 +984,7 @@
}
Message message = ERR_JEB_BACKUP_CANNOT_GET_CIPHER.get(
- cipherAlgorithm, stackTraceToSingleLineString(e));
+ e.getMessage());
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
message, e);
}
@@ -1307,14 +1301,11 @@
// input stream.
if (encrypt)
{
- String cipherAlgorithm =
- backupProperties.get(BACKUP_PROPERTY_CIPHER_ALGORITHM);
-
try
{
inputStream = cryptoManager.getCipherInputStream(inputStream);
}
- catch (Exception e)
+ catch (CryptoManager.CryptoManagerException e)
{
if (debugEnabled())
{
@@ -1322,7 +1313,7 @@
}
Message message = ERR_JEB_BACKUP_CANNOT_GET_CIPHER.get(
- cipherAlgorithm, stackTraceToSingleLineString(e));
+ e.getMessage());
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
message, e);
}
--
Gitblit v1.10.0