From 83dadb40123e47521a6bbe411fb37593faa8490f Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Thu, 23 Jun 2011 08:41:21 +0000
Subject: [PATCH] Fix issue OPENDJ-213. Processing of the string based cookie was not handling errors consistently, as code was duplicated between the constructor and another parsing method. The fix required some minor refactoring. All nightlytests have been successfully passing on my development machine.
---
opends/src/server/org/opends/server/replication/protocol/ECLUpdateMsg.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/protocol/ECLUpdateMsg.java b/opends/src/server/org/opends/server/replication/protocol/ECLUpdateMsg.java
index 2e1dc1d..7fbc35d 100644
--- a/opends/src/server/org/opends/server/replication/protocol/ECLUpdateMsg.java
+++ b/opends/src/server/org/opends/server/replication/protocol/ECLUpdateMsg.java
@@ -23,11 +23,13 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.replication.protocol;
import java.io.UnsupportedEncodingException;
import java.util.zip.DataFormatException;
+import org.opends.server.types.DirectoryException;
import org.opends.server.replication.common.MultiDomainServerState;
/**
@@ -114,6 +116,10 @@
encodedMsg, ProtocolVersion.getCurrentVersion());
this.updateMsg = (LDAPUpdateMsg)rmsg;
}
+ catch(DirectoryException de)
+ {
+ throw new DataFormatException(de.toString());
+ }
catch (UnsupportedEncodingException e)
{
throw new DataFormatException("UTF-8 is not supported by this jvm.");
--
Gitblit v1.10.0