From a823b4534f665b744b990e2f641b6ff28eb35d0d Mon Sep 17 00:00:00 2001
From: pgamba <pgamba@localhost>
Date: Wed, 13 Jan 2010 10:17:48 +0000
Subject: [PATCH] Fix potential NPE on stopRSHeartBeatMonitoring in unit test and document service
---
opends/src/server/org/opends/server/replication/service/ReplicationBroker.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java b/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java
index 3bc4795..bd145d6 100644
--- a/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java
+++ b/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2009 Sun Microsystems, Inc.
+ * Copyright 2006-2010 Sun Microsystems, Inc.
*/
package org.opends.server.replication.service;
@@ -1690,7 +1690,7 @@
/**
* Stops the same group id poller.
*/
- private void stopSameGroupIdPoller()
+ private synchronized void stopSameGroupIdPoller()
{
if (sameGroupIdPoller != null)
{
@@ -1703,7 +1703,7 @@
/**
* Stop the heartbeat monitor thread.
*/
- void stopRSHeartBeatMonitoring()
+ synchronized void stopRSHeartBeatMonitoring()
{
if (heartbeatMonitor != null)
{
@@ -2573,7 +2573,7 @@
/**
* Stops publishing to the RS the current timestamp used in this server.
*/
- public void stopChangeTimeHeartBeatPublishing()
+ public synchronized void stopChangeTimeHeartBeatPublishing()
{
if (ctHeartbeatPublisherThread != null)
{
--
Gitblit v1.10.0