mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git
blame | history | patch | commit | commitdiff | ignore whitespace
jcduff
23.04.2008 f73b655466092169abac34833fb628fce1fcdebe 
 opends/src/server/org/opends/server/backends/task/TaskBackend.java


@@ -660,10 +660,10 @@


   * {@inheritDoc}


   */


  @Override()


  public void replaceEntry(Entry entry, ModifyOperation modifyOperation)


         throws DirectoryException


  public void replaceEntry(Entry oldEntry, Entry newEntry,


      ModifyOperation modifyOperation) throws DirectoryException


  {


    DN entryDN = entry.getDN();


    DN entryDN = newEntry.getDN();




    Lock entryLock = null;


    if (! taskScheduler.holdsSchedulerLock())


@@ -715,8 +715,8 @@


        TaskState state = t.getTaskState();


        if (TaskState.isPending(state))


        {


          Task newTask =


                    taskScheduler.entryToScheduledTask(entry, modifyOperation);


          Task newTask = taskScheduler.entryToScheduledTask(newEntry,


              modifyOperation);


          taskScheduler.removePendingTask(t.getTaskID());


          taskScheduler.scheduleTask(newTask, true);


          return;


@@ -749,7 +749,7 @@


              break;


            }




            Iterator<AttributeValue> iterator = a.getValues().iterator();


            Iterator<AttributeValue> iterator = a.iterator();


            if (! iterator.hasNext())


            {


              acceptable = false;