From 54afea4d5cca707848b9b04b739781d9905b948a Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 13 Jan 2014 10:35:10 +0000
Subject: [PATCH] ECLServerHandler.java: Fixed NPE in tests.
---
opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerHandler.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerHandler.java b/opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerHandler.java
index 6c72591..c51a1ee 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerHandler.java
@@ -413,7 +413,7 @@
super(session, queueSize, replicationServer, rcvWindowSize);
try
{
- DN baseDN = DN.valueOf(ServerConstants.DN_EXTERNAL_CHANGELOG_ROOT);
+ DN baseDN = DN.decode(ServerConstants.DN_EXTERNAL_CHANGELOG_ROOT);
setBaseDNAndDomain(baseDN, true);
}
catch(DirectoryException de)
@@ -1472,7 +1472,11 @@
*/
public String getOperationId()
{
- return startECLSessionMsg.getOperationId();
+ if (startECLSessionMsg != null)
+ {
+ return startECLSessionMsg.getOperationId();
+ }
+ return "";
}
/**
--
Gitblit v1.10.0