From f29d7b821286b9dd8e173150aea5417737d1fa58 Mon Sep 17 00:00:00 2001
From: coulbeck <coulbeck@localhost>
Date: Fri, 16 Feb 2007 17:46:54 +0000
Subject: [PATCH] Tidy up synchronized blocks in ServerHandler.
---
opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ServerHandler.java | 48 +++++++++++++++++++++---------------------------
1 files changed, 21 insertions(+), 27 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ServerHandler.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ServerHandler.java
index 27a6be2..c78d537 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ServerHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/changelog/ServerHandler.java
@@ -72,9 +72,9 @@
{
private short serverId;
private ProtocolSession session;
- private MsgQueue msgQueue = new MsgQueue();
+ private final MsgQueue msgQueue = new MsgQueue();
private MsgQueue lateQueue = new MsgQueue();
- private Map<ChangeNumber, AckMessageList> waitingAcks =
+ private final Map<ChangeNumber, AckMessageList> waitingAcks =
new HashMap<ChangeNumber, AckMessageList>();
private ChangelogCache changelogCache = null;
private String serverURL;
@@ -120,7 +120,7 @@
*/
HeartbeatThread heartbeatThread = null;
- private static Map<ChangeNumber, ChangelogAckMessageList>
+ private static final Map<ChangeNumber, ChangelogAckMessageList>
changelogsWaitingAcks = new HashMap<ChangeNumber, ChangelogAckMessageList>();
/**
@@ -453,37 +453,31 @@
{
synchronized (msgQueue)
{
- if (msgQueue == null)
- return true;
+ int queueSize = msgQueue.size();
+ if ((maxReceiveQueue > 0) && (queueSize >= restartReceiveQueue))
+ return false;
+ if ((source != null) && (source.maxSendQueue > 0) &&
+ (queueSize >= source.restartSendQueue))
+ return false;
- synchronized (msgQueue)
+ if (!msgQueue.isEmpty())
{
- int queueSize = msgQueue.size();
- if ((maxReceiveQueue > 0) && (queueSize >= restartReceiveQueue))
- return false;
- if ((source != null) && (source.maxSendQueue > 0) &&
- (queueSize >= source.restartSendQueue))
- return false;
+ UpdateMessage firstUpdate = msgQueue.first();
+ UpdateMessage lastUpdate = msgQueue.last();
- if (!msgQueue.isEmpty())
+ if ((firstUpdate != null) && (lastUpdate != null))
{
- UpdateMessage firstUpdate = msgQueue.first();
- UpdateMessage lastUpdate = msgQueue.last();
-
- if ((firstUpdate != null) && (lastUpdate != null))
- {
- long timeDiff = lastUpdate.getChangeNumber().getTimeSec() -
- firstUpdate.getChangeNumber().getTimeSec();
- if ((maxReceiveDelay > 0) && (timeDiff >= restartReceiveDelay))
- return false;
- if ((source != null) && (source.maxSendDelay > 0)
- && (timeDiff >= source.restartSendDelay))
- return false;
- }
+ long timeDiff = lastUpdate.getChangeNumber().getTimeSec() -
+ firstUpdate.getChangeNumber().getTimeSec();
+ if ((maxReceiveDelay > 0) && (timeDiff >= restartReceiveDelay))
+ return false;
+ if ((source != null) && (source.maxSendDelay > 0)
+ && (timeDiff >= source.restartSendDelay))
+ return false;
}
}
- return true;
}
+ return true;
}
/**
--
Gitblit v1.10.0