From 1a584561ff6ab1c0eb766f2835bdeb6224fc7312 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 04 Jun 2014 10:11:39 +0000
Subject: [PATCH] Fixing blocked nightly tests. Problem was due to an NPE while deserializing StartECLSessionMsg: ByteArrayScanner.nextString(), can return null, while previous code was always creating an empty string when using the older API.
---
opends/src/server/org/opends/server/replication/protocol/StartECLSessionMsg.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/protocol/StartECLSessionMsg.java b/opends/src/server/org/opends/server/replication/protocol/StartECLSessionMsg.java
index d62c9e9..2f9f80d 100644
--- a/opends/src/server/org/opends/server/replication/protocol/StartECLSessionMsg.java
+++ b/opends/src/server/org/opends/server/replication/protocol/StartECLSessionMsg.java
@@ -172,7 +172,7 @@
crossDomainServerState = scanner.nextString();
operationId = scanner.nextString();
final String excludedDNsString = scanner.nextString();
- if (excludedDNsString.length() > 0)
+ if (excludedDNsString != null && excludedDNsString.length() > 0)
{
Collections.addAll(excludedBaseDNs, excludedDNsString.split(";"));
}
--
Gitblit v1.10.0