From 976da4aa6126aefd775b7c223c71e29d1207bf10 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 11 Dec 2013 17:17:53 +0000
Subject: [PATCH] Fix OPENDJ-1247: Client side timeouts do not cancel bind or startTLS requests properly
---
opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPExtendedFutureResultImpl.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPExtendedFutureResultImpl.java b/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPExtendedFutureResultImpl.java
index 7dfe521..8d75302 100644
--- a/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPExtendedFutureResultImpl.java
+++ b/opendj-ldap-sdk/src/main/java/com/forgerock/opendj/ldap/LDAPExtendedFutureResultImpl.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions copyright 2011 ForgeRock AS.
+ * Portions copyright 2011-2013 ForgeRock AS.
*/
package com.forgerock.opendj.ldap;
@@ -66,12 +66,9 @@
return sb.toString();
}
- /**
- * {@inheritDoc}
- */
@Override
- protected boolean isCancelable() {
- return !request.getOID().equals(StartTLSExtendedRequest.OID);
+ boolean isBindOrStartTLS() {
+ return request.getOID().equals(StartTLSExtendedRequest.OID);
}
R decodeResult(final ExtendedResult result, final DecodeOptions options) throws DecodeException {
--
Gitblit v1.10.0