From 46fd9423ab622d7f9531aa1564846ec52fe09534 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Wed, 24 Apr 2013 12:44:51 +0000
Subject: [PATCH] Replication Cleanup.
---
opends/src/server/org/opends/server/replication/server/ServerHandler.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ServerHandler.java b/opends/src/server/org/opends/server/replication/server/ServerHandler.java
index 20d7bd3..af1f1ba 100644
--- a/opends/src/server/org/opends/server/replication/server/ServerHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/ServerHandler.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions copyright 2011-2012 ForgeRock AS
+ * Portions copyright 2011-2013 ForgeRock AS
*/
package org.opends.server.replication.server;
@@ -170,11 +170,12 @@
/**
* The associated ServerWriter that sends messages to the remote server.
*/
- protected ServerReader reader;
+ protected ServerWriter writer = null;
+
/**
* The associated ServerReader that receives messages from the remote server.
*/
- protected ServerWriter writer = null;
+ protected ServerReader reader;
// window
private int rcvWindow;
@@ -366,7 +367,7 @@
session.setSoTimeout(0);
}
catch(Exception e)
- {
+ { /* do nothing */
}
// sendWindow MUST be created before starting the writer
@@ -1148,10 +1149,9 @@
*/
public RSInfo toRSInfo()
{
- RSInfo rsInfo = new RSInfo(serverId, serverURL, generationId, groupId,
- weight);
- return rsInfo;
+ return new RSInfo(serverId, serverURL, generationId, groupId,
+ weight);
}
/**
--
Gitblit v1.10.0