Fix issue OpenDJ-101: NPE when processing UniqueAttributePlugin/Authenticat...

Matthew Swift

04.48.2011 164610bf3b661e1997856d02fbabef06252bcf3f

Fix issue OpenDJ-101: NPE when processing UniqueAttributePlugin/AuthenticatedUsers ChangeListener post-sync for moddn operations with conflicts

 opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java

@@ -1979,7 +1979,7 @@
      if (findEntryDN(uuid) != null)
      {
        return new SynchronizationProviderResult.StopProcessing(
            ResultCode.CANCELED, null);
            ResultCode.NO_OPERATION, null);
      }

      /* The parent entry may have been renamed here since the change was done
@@ -2154,7 +2154,7 @@
      if (hist.AddedOrRenamedAfter(ctx.getChangeNumber()))
      {
        return new SynchronizationProviderResult.StopProcessing(
            ResultCode.SUCCESS, null);
            ResultCode.NO_OPERATION, null);
      }
    }
    else
@@ -2211,7 +2211,7 @@
          // Every modifications filtered in this operation: the operation
          // becomes a no-op
          return new SynchronizationProviderResult.StopProcessing(
            ResultCode.SUCCESS, null);
            ResultCode.NO_OPERATION, null);
        }
      }
      else
@@ -2702,31 +2702,47 @@

          if (result != ResultCode.SUCCESS)
          {
            if (op instanceof ModifyOperation)
            if (result == ResultCode.NO_OPERATION)
            {
              // Pre-operation conflict resolution detected that the operation
              // was a no-op. For example, an add which has already been
              // replayed, or a modify DN operation on an entry which has been
              // renamed by a more recent modify DN.
              done = true;
            }
            else if (op instanceof ModifyOperation)
            {
              ModifyOperation newOp = (ModifyOperation) op;
              dependency = remotePendingChanges.checkDependencies(newOp);
              dependency = remotePendingChanges
                  .checkDependencies(newOp);
              ModifyMsg modifyMsg = (ModifyMsg) msg;
              done = solveNamingConflict(newOp, modifyMsg);
            } else if (op instanceof DeleteOperation)
            }
            else if (op instanceof DeleteOperation)
            {
              DeleteOperation newOp = (DeleteOperation) op;
              dependency = remotePendingChanges.checkDependencies(newOp);
              dependency = remotePendingChanges
                  .checkDependencies(newOp);
              done = solveNamingConflict(newOp, msg);
            } else if (op instanceof AddOperation)
            }
            else if (op instanceof AddOperation)
            {
              AddOperation newOp = (AddOperation) op;
              AddMsg addMsg = (AddMsg) msg;
              dependency = remotePendingChanges.checkDependencies(newOp);
              dependency = remotePendingChanges
                  .checkDependencies(newOp);
              done = solveNamingConflict(newOp, addMsg);
            } else if (op instanceof ModifyDNOperationBasis)
            }
            else if (op instanceof ModifyDNOperationBasis)
            {
              ModifyDNOperationBasis newOp = (ModifyDNOperationBasis) op;
                  done = solveNamingConflict(newOp, msg);
            } else
            {
              done = true;  // unknown type of operation ?!
              done = solveNamingConflict(newOp, msg);
            }
            else
            {
              done = true; // unknown type of operation ?!
            }

            if (done)
            {
              // the update became a dummy update and the result

 opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java

@@ -23,6 +23,7 @@
 *
 *
 *      Copyright 2006-2010 Sun Microsystems, Inc.
 *      Portions Copyright 2011 ForgeRock AS
 */
package org.opends.server.replication.plugin;