From 06eadb122b5e1d11bfbd4faccada66b34fd4c92a Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 29 Apr 2014 12:40:47 +0000
Subject: [PATCH] Support suffixes containing space in the changelog state DB.

---
 opends/src/server/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/opends/src/server/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java b/opends/src/server/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java
index 32b419e..e4d7283 100644
--- a/opends/src/server/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java
+++ b/opends/src/server/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java
@@ -252,12 +252,13 @@
 
         if (debugEnabled())
         {
-          debug("read (key, value)=(" + stringKey + ", " + stringData + ")");
+          debug("read (key, data)=(" + stringKey + ", " + stringData + ")");
         }
 
-        final String[] str = stringData.split(FIELD_SEPARATOR, 3);
-        if (str[0].equals(GENERATION_ID_TAG))
+        final String prefix = stringKey.split(FIELD_SEPARATOR)[0];
+        if (prefix.equals(GENERATION_ID_TAG))
         {
+          final String[] str = stringData.split(FIELD_SEPARATOR, 3);
           final long generationId = toLong(str[1]);
           final DN baseDN = DN.decode(str[2]);
           if (debugEnabled())
@@ -269,6 +270,7 @@
         }
         else
         {
+          final String[] str = stringData.split(FIELD_SEPARATOR, 2);
           final int serverId = toInt(str[0]);
           final DN baseDN = DN.decode(str[1]);
           if (debugEnabled())

--
Gitblit v1.10.0