From 5b2a1411644980f10b6d826155752f85e40bdd78 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 25 Sep 2013 08:39:41 +0000
Subject: [PATCH] OPENDJ-1134 (CR-2355) Introduce a class in replication for encapsulating host+port combinations
---
opends/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java | 70 ++++++-----------------------------
1 files changed, 12 insertions(+), 58 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java b/opends/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java
index 7c22efc..1ae8b2c 100644
--- a/opends/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java
+++ b/opends/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java
@@ -25,14 +25,8 @@
* Copyright 2008 Sun Microsystems, Inc.
* Portions copyright 2011-2013 ForgeRock AS
*/
-
package org.opends.server.replication.protocol;
-
-
-import static org.opends.messages.ReplicationMessages.*;
-import static org.opends.server.loggers.ErrorLogger.logError;
-
import java.io.IOException;
import java.net.Socket;
import java.util.SortedSet;
@@ -47,7 +41,9 @@
import org.opends.server.types.CryptoManager;
import org.opends.server.types.DirectoryConfig;
-
+import static org.opends.messages.ReplicationMessages.*;
+import static org.opends.server.loggers.ErrorLogger.*;
+import static org.opends.server.util.StaticUtils.*;
/**
* This class represents the security configuration for replication protocol
@@ -171,12 +167,10 @@
{
// Create a new SSL context every time to make sure we pick up the
// latest contents of the trust store.
- final CryptoManager cryptoManager = DirectoryConfig
- .getCryptoManager();
+ final CryptoManager cryptoManager = DirectoryConfig.getCryptoManager();
final SSLContext sslContext = cryptoManager
.getSslContext(sslCertNickname);
- final SSLSocketFactory sslSocketFactory = sslContext
- .getSocketFactory();
+ final SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
secureSocket = (SSLSocket) sslSocketFactory.createSocket(
socket, socket.getInetAddress().getHostName(),
@@ -203,26 +197,8 @@
{
if (!hasCompleted)
{
- try
- {
- socket.close();
- }
- catch (final Exception ignored)
- {
- // Ignore.
- }
-
- if (secureSocket != null)
- {
- try
- {
- secureSocket.close();
- }
- catch (final Exception ignored)
- {
- // Ignore.
- }
- }
+ close(socket);
+ close(secureSocket);
}
}
}
@@ -254,12 +230,10 @@
{
// Create a new SSL context every time to make sure we pick up the
// latest contents of the trust store.
- final CryptoManager cryptoManager = DirectoryConfig
- .getCryptoManager();
+ final CryptoManager cryptoManager = DirectoryConfig.getCryptoManager();
final SSLContext sslContext = cryptoManager
.getSslContext(sslCertNickname);
- final SSLSocketFactory sslSocketFactory = sslContext
- .getSocketFactory();
+ final SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
secureSocket = (SSLSocket) sslSocketFactory.createSocket(
socket, socket.getInetAddress().getHostName(),
@@ -298,26 +272,8 @@
{
if (!hasCompleted)
{
- try
- {
- socket.close();
- }
- catch (final Exception ignored)
- {
- // Ignore.
- }
-
- if (secureSocket != null)
- {
- try
- {
- secureSocket.close();
- }
- catch (final Exception ignored)
- {
- // Ignore.
- }
- }
+ close(socket);
+ close(secureSocket);
}
}
}
@@ -328,12 +284,10 @@
* Determine whether sessions to a given replication server should be
* encrypted.
*
- * @param serverURL
- * The replication server URL.
* @return true if sessions to the given replication server should be
* encrypted, or false if they should not be encrypted.
*/
- public boolean isSslEncryption(final String serverURL)
+ public boolean isSslEncryption()
{
// Currently use global settings from the crypto manager.
return sslEncryption;
--
Gitblit v1.10.0