From 83697b286a7a84fb9a91866b2c6f81f5584f39c4 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 18 Feb 2014 16:11:34 +0000
Subject: [PATCH] OPENDJ-1308 Migrate schema support
---
opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java b/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java
index 2ffd000..f6abb09 100644
--- a/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java
+++ b/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java
@@ -226,10 +226,9 @@
final InternalSearchOperation internalSO =
icc.processSearch(valueOf(request.getName()), request.getScope(),
- to(request.getDereferenceAliasesPolicy()), request.getSizeLimit(),
- request.getTimeLimit(), request.isTypesOnly(), to(request
- .getFilter()), new LinkedHashSet<String>(request
- .getAttributes()), to(request.getControls()),
+ request.getDereferenceAliasesPolicy(), request.getSizeLimit(),
+ request.getTimeLimit(), request.isTypesOnly(), to(request.getFilter()),
+ new LinkedHashSet<String>(request.getAttributes()), to(request.getControls()),
internalSearchListener);
return getResponseResult(internalSO);
@@ -294,7 +293,7 @@
} catch (DecodeException e) {
return request.getResultDecoder().newExtendedErrorResult(
- ResultCode.valueOf(extendedOperation.getResultCode().getIntValue()),
+ extendedOperation.getResultCode(),
(extendedOperation.getMatchedDN() != null ? extendedOperation
.getMatchedDN().toString() : null),
extendedOperation.getErrorMessage().toString());
@@ -313,10 +312,9 @@
final CompareOperation compareOperation =
icc.processCompare(valueOf(request.getName()),
request.getAttributeDescription().toString(),
- valueOf(request.getAssertionValueAsString()), to(request.getControls()));
+ request.getAssertionValue(), to(request.getControls()));
- CompareResult result =
- Responses.newCompareResult(getResultCode(compareOperation));
+ CompareResult result = Responses.newCompareResult(compareOperation.getResultCode());
result = getResponseResult(compareOperation, result);
return result;
}
@@ -350,7 +348,7 @@
((SASLBindRequest) request).getSASLMechanism(),
getCredentials(genericBindRequest.getAuthenticationValue()),
to(request.getControls()));
- } while (bindOperation.getResultCode() == org.opends.server.types.ResultCode.SASL_BIND_IN_PROGRESS);
+ } while (bindOperation.getResultCode() == ResultCode.SASL_BIND_IN_PROGRESS);
bindClient.dispose();
@@ -358,8 +356,7 @@
throw ErrorResultException.newErrorResult(Responses
.newResult(ResultCode.AUTH_METHOD_NOT_SUPPORTED));
}
- BindResult result =
- Responses.newBindResult(getResultCode(bindOperation));
+ BindResult result = Responses.newBindResult(bindOperation.getResultCode());
result.setServerSASLCredentials(bindOperation.getSASLCredentials());
if (result.isSuccess()) {
--
Gitblit v1.10.0