From 84a2240956475fbcc73b3fcf5aa20ebde6269aa0 Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <yannick.lecaillez@forgerock.com>
Date: Thu, 19 May 2016 15:10:45 +0000
Subject: [PATCH] Fix NPE when extended operations response is null.

---
 opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java b/opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java
index eab6f55..4d575ff 100644
--- a/opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java
+++ b/opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java
@@ -212,9 +212,9 @@
               final Result result = getResponseResult(extendedOperation);
               final GenericExtendedResult genericExtendedResult =
                       Responses.newGenericExtendedResult(result.getResultCode())
-                              .setDiagnosticMessage(result.getDiagnosticMessage()).setMatchedDN(
-                                      result.getMatchedDN()).setValue(
-                                      extendedOperation.getResponseValue().toByteString());
+                               .setDiagnosticMessage(result.getDiagnosticMessage())
+                               .setMatchedDN(result.getMatchedDN())
+                               .setValue(extendedOperation.getResponseValue());
               try {
                   R extendedResult =
                           request.getResultDecoder().decodeExtendedResult(genericExtendedResult,

--
Gitblit v1.10.0