From 4b8038247ef707bb6b31df540318c3d20067af26 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 03 Jan 2014 10:04:04 +0000
Subject: [PATCH] OPENDJ-1205 Remove network layer from External ChangeLog implementation
---
opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerReader.java | 23 ++++-------------------
1 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerReader.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerReader.java
index 9f31cd2..06a75cf 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerReader.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ServerReader.java
@@ -22,11 +22,11 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2013 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.opends.server.replication.server;
-import java.io.IOException;
+import java.net.SocketException;
import org.opends.messages.Message;
import org.opends.server.api.DirectoryThread;
@@ -59,9 +59,6 @@
private static final DebugTracer TRACER = getTracer();
private final Session session;
private final ServerHandler handler;
- private final String remoteAddress;
-
-
/**
* Constructor for the LDAP server reader part of the replicationServer.
@@ -78,7 +75,6 @@
+ session.getReadableRemoteAddress());
this.session = session;
this.handler = handler;
- this.remoteAddress = session.getReadableRemoteAddress();
}
/**
@@ -247,7 +243,7 @@
}
}
}
- catch (IOException e)
+ catch (SocketException e)
{
/*
* The connection has been broken
@@ -257,18 +253,7 @@
logException(e);
if (!handler.shuttingDown())
{
- if (handler.isDataServer())
- {
- errMessage = ERR_DS_BADLY_DISCONNECTED.get(
- handler.getReplicationServerId(), handler.getServerId(),
- remoteAddress, handler.getBaseDNString());
- }
- else
- {
- errMessage = ERR_RS_BADLY_DISCONNECTED.get(
- handler.getReplicationServerId(), handler.getServerId(),
- remoteAddress, handler.getBaseDNString());
- }
+ errMessage = handler.getBadlyDisconnectedErrorMessage();
logError(errMessage);
}
}
--
Gitblit v1.10.0