From 26dcd79e2f37afc36a9f9daa07a7aabd5168fc49 Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Fri, 23 Jan 2009 14:22:38 +0000
Subject: [PATCH] Fix 2 small regression introduced recently in the replication code on the trunk
---
opends/src/server/org/opends/server/replication/common/ServerState.java | 4 ++--
opends/src/server/org/opends/server/replication/server/DbHandler.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/common/ServerState.java b/opends/src/server/org/opends/server/replication/common/ServerState.java
index e6f1b7c..cf2f0f8 100644
--- a/opends/src/server/org/opends/server/replication/common/ServerState.java
+++ b/opends/src/server/org/opends/server/replication/common/ServerState.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2009 Sun Microsystems, Inc.
*/
package org.opends.server.replication.common;
@@ -431,7 +431,7 @@
*/
public void setSaved(boolean b)
{
- saved = false;
+ saved = b;
}
/**
diff --git a/opends/src/server/org/opends/server/replication/server/DbHandler.java b/opends/src/server/org/opends/server/replication/server/DbHandler.java
index 1f21de3..cca49f5 100644
--- a/opends/src/server/org/opends/server/replication/server/DbHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/DbHandler.java
@@ -398,7 +398,7 @@
{
try
{
- msgQueue.wait(10000);
+ msgQueue.wait(1000);
} catch (InterruptedException e)
{ }
}
--
Gitblit v1.10.0