From 689f5fecf900cf69a0d6889f96014aef48abc603 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 25 Nov 2016 14:50:10 +0000
Subject: [PATCH] Hide more DirectoryServer.getCryptoManager()
---
opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerSync.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerSync.java b/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerSync.java
index 3506c95..9cff8a7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerSync.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerSync.java
@@ -233,11 +233,11 @@
{
if (searchEntry.hasObjectClass(ocCipherKey))
{
- DirectoryServer.getCryptoManager().importCipherKeyEntry(searchEntry);
+ getCryptoManager().importCipherKeyEntry(searchEntry);
}
else if (searchEntry.hasObjectClass(ocMacKey))
{
- DirectoryServer.getCryptoManager().importMacKeyEntry(searchEntry);
+ getCryptoManager().importMacKeyEntry(searchEntry);
}
}
catch (CryptoManagerException e)
@@ -248,6 +248,11 @@
}
}
+ private CryptoManagerImpl getCryptoManager()
+ {
+ return DirectoryServer.getCryptoManager();
+ }
+
private void handleInstanceKeySearchEntry(SearchResultEntry searchEntry)
throws DirectoryException
@@ -414,11 +419,11 @@
{
if (entry.hasObjectClass(ocCipherKey))
{
- DirectoryServer.getCryptoManager().importCipherKeyEntry(entry);
+ getCryptoManager().importCipherKeyEntry(entry);
}
else if (entry.hasObjectClass(ocMacKey))
{
- DirectoryServer.getCryptoManager().importMacKeyEntry(entry);
+ getCryptoManager().importMacKeyEntry(entry);
}
}
catch (CryptoManagerException e)
@@ -487,11 +492,11 @@
{
if (newEntry.hasObjectClass(ocCipherKey))
{
- DirectoryServer.getCryptoManager().importCipherKeyEntry(newEntry);
+ getCryptoManager().importCipherKeyEntry(newEntry);
}
else if (newEntry.hasObjectClass(ocMacKey))
{
- DirectoryServer.getCryptoManager().importMacKeyEntry(newEntry);
+ getCryptoManager().importMacKeyEntry(newEntry);
}
}
catch (CryptoManagerException e)
--
Gitblit v1.10.0