Fix a problem in the modify operation processing that could cause a null po...

neil_a_wilson

26.52.2007 66f4d2de8922623e2d3bd90be9f0bab5f5ea16e2

Fix a problem in the modify operation processing that could cause a null
pointer exception in the event that the modify operation targeted the root DSE.

OpenDS Issue Number:  1447

 opends/src/server/org/opends/server/core/ModifyOperation.java

@@ -1889,7 +1889,7 @@
                if (missingValues.isEmpty())
                {
                  RDN rdn = modifiedEntry.getDN().getRDN();
                  if (rdn.hasAttributeType(t) &&
                  if ((rdn != null) && rdn.hasAttributeType(t) &&
                      (! modifiedEntry.hasValue(t, a.getOptions(),
                                                rdn.getAttributeValue(t))))
                  {
@@ -1964,7 +1964,7 @@
              {
                modifiedEntry.removeAttribute(t, a.getOptions());
                RDN rdn = modifiedEntry.getDN().getRDN();
                if (rdn.hasAttributeType(t) &&
                if ((rdn != null) && rdn.hasAttributeType(t) &&
                    (! modifiedEntry.hasValue(t, a.getOptions(),
                                              rdn.getAttributeValue(t))))
                {
@@ -2042,7 +2042,7 @@
                modifiedEntry.putAttribute(t, attrList);

                RDN rdn = modifiedEntry.getDN().getRDN();
                if (rdn.hasAttributeType(t) &&
                if ((rdn != null) && rdn.hasAttributeType(t) &&
                    (! modifiedEntry.hasValue(t, a.getOptions(),
                                              rdn.getAttributeValue(t))))
                {
@@ -2067,7 +2067,7 @@
                modifiedEntry.putAttribute(t, attrList);

                RDN rdn = modifiedEntry.getDN().getRDN();
                if (rdn.hasAttributeType(t) &&
                if ((rdn != null) && rdn.hasAttributeType(t) &&
                    (! modifiedEntry.hasValue(t, a.getOptions(),
                                              rdn.getAttributeValue(t))))
                {
@@ -2102,7 +2102,7 @@
              }

              RDN rdn = modifiedEntry.getDN().getRDN();
              if (rdn.hasAttributeType(t) &&
              if ((rdn != null) && rdn.hasAttributeType(t) &&
                  (! modifiedEntry.hasValue(t, a.getOptions(),
                                            rdn.getAttributeValue(t))))
              {
@@ -2119,7 +2119,7 @@
            case INCREMENT:
              // The specified attribute type must not be an RDN attribute.
              rdn = modifiedEntry.getDN().getRDN();
              if (rdn.hasAttributeType(t))
              if ((rdn != null) && rdn.hasAttributeType(t))
              {
                setResultCode(ResultCode.NOT_ALLOWED_ON_RDN);
                appendErrorMessage(getMessage(MSGID_MODIFY_INCREMENT_RDN,