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

Jean-Noel Rouvignac
16.23.2015 e0190b324fb92c3b82cd143d3aab1eeede951e94
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Template.java
@@ -354,8 +354,9 @@
      for (TemplateLine l : templateLines)
      {
        TagResult r = l.generateLine(templateEntry);
        if (! (r.keepProcessingEntry() && r.keepProcessingParent() &&
               r.keepProcessingTemplateFile()))
        if (!r.keepProcessingEntry()
            || !r.keepProcessingParent()
            || !r.keepProcessingTemplateFile())
        {
          return r;
        }
@@ -371,7 +372,8 @@
        TagResult r =
             subordinateTemplates[j].writeEntries(entryWriter,
                 templateEntry.getDN(), numEntriesPerTemplate[j]);
        if (! (r.keepProcessingParent() && r.keepProcessingTemplateFile()))
        if (!r.keepProcessingParent()
            || !r.keepProcessingTemplateFile())
        {
          if (r.keepProcessingTemplateFile())
          {