mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

ludovicp
31.49.2010 003e3993c5ca89b1a8cbb4dc844aa1f882203475
Update BDB JE to version 4.0.103
Handle properly notice of disconnection in ldapmodify CLI.
2 files modified
33 ■■■■■ changed files
opendj-sdk/opends/lib/je.jar patch | view | raw | blame | history
opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModify.java 33 ●●●●● patch | view | raw | blame | history
opendj-sdk/opends/lib/je.jar
Binary files differ
opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModify.java
@@ -76,6 +76,8 @@
import org.opends.server.controls.*;
import org.opends.server.plugins.ChangeNumberControlPlugin;
import org.opends.server.protocols.ldap.ExtendedResponseProtocolOp;
import org.opends.server.protocols.ldap.LDAPConstants;
@@ -359,6 +361,8 @@
        Message errorMessage = null;
        DN matchedDN = null;
        List<String> referralURLs = null;
        try
        {
        switch(entry.getChangeOperationType())
        {
          case ADD:
@@ -396,6 +400,35 @@
          default:
            break;
        }
        }
        catch (ClassCastException ce)
        {
          // It is possible that this is extended response.
          if (responseMessage.getProtocolOpType() ==
              LDAPConstants.OP_TYPE_EXTENDED_RESPONSE)
          {
            ExtendedResponseProtocolOp extRes =
              responseMessage.getExtendedResponseProtocolOp();
            resultCode = extRes.getResultCode();
            errorMessage = extRes.getErrorMessage();
            matchedDN = extRes.getMatchedDN();
            referralURLs = extRes.getReferralURLs();
          }
          else
          {
            // This shouldnt happen but if it does debug
            // log it, set the error code to OTHER and
            // fall thru.
            if (debugEnabled())
            {
              TRACER.debugCaught(DebugLogLevel.ERROR, ce);
            }
            resultCode = ResultCode.OTHER.getIntValue();
            errorMessage = null;
            matchedDN = null;
            referralURLs = null;
          }
        }
        if(resultCode != SUCCESS && resultCode != REFERRAL)
        {