From 4a438e182fd5349dc4a36ca59fc3c3501442f49d Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 17 Jul 2015 13:45:16 +0000
Subject: [PATCH] OPENDJ-1666 code cleanup
---
opendj-core/clirr-ignored-api-changes.xml | 17 ++++++++---------
opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseWrapper.java | 2 +-
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/opendj-core/clirr-ignored-api-changes.xml b/opendj-core/clirr-ignored-api-changes.xml
index 9640941..d9410d2 100644
--- a/opendj-core/clirr-ignored-api-changes.xml
+++ b/opendj-core/clirr-ignored-api-changes.xml
@@ -432,13 +432,12 @@
<method>boolean startsWith(org.forgerock.opendj.ldap.ByteSequence)</method>
<justification>Lack of startsWith() forced to re-implement it multiple times at different location</justification>
</difference>
- <difference>
- <className>org/forgerock/opendj/ldap/ByteString</className>
- <differenceType>7005</differenceType>
- <method>org.forgerock.opendj.ldap.ByteString valueOf(java.lang.String)
- </method>
- <from>org.forgerock.opendj.ldap.ByteString valueOf(java.lang.String)</from>
- <to>org.forgerock.opendj.ldap.ByteString valueOf(java.lang.CharSequence)</to>
- <justification>Using CharSequence instead of String allows to reduce memory copy.</justification>
- </difference>
+ <difference>
+ <className>org/forgerock/opendj/ldap/ByteString</className>
+ <differenceType>7005</differenceType>
+ <method>org.forgerock.opendj.ldap.ByteString valueOf(java.lang.String)</method>
+ <from>org.forgerock.opendj.ldap.ByteString valueOf(java.lang.String)</from>
+ <to>org.forgerock.opendj.ldap.ByteString valueOf(java.lang.CharSequence)</to>
+ <justification>Using CharSequence instead of String allows to reduce memory copy.</justification>
+ </difference>
</differences>
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseWrapper.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseWrapper.java
index be80aa4..229513d 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseWrapper.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseWrapper.java
@@ -134,7 +134,7 @@
@Override
// @Checkstyle:ignore
public <VOUT> LdapPromise<VOUT> then(Function<? super R, VOUT, LdapException> onSuccess) {
- return LdapPromises.wrap(wrappedPromise.then(onSuccess), getRequestID());
+ return wrap(wrappedPromise.then(onSuccess), getRequestID());
}
@Override
--
Gitblit v1.10.0