Uploaded image for project: 'XWiki Commons'
  1. XWiki Commons
  2. XCOMMONS-2137

Possible IllegalArgumentException when performing a merge

    XMLWordPrintable

    Details

    • Tests:
      Unit, Integration
    • Difficulty:
      Unknown
    • Documentation:
      N/A
    • Documentation in Release Notes:
      N/A
    • Similar issues:

      Description

      It's possible to obtain this kind of stacktrace when performing a diff merge:

      java.lang.IllegalArgumentException: fromIndex(18) > toIndex(11)
      
      	at java.util.ArrayList.subListRangeCheck(ArrayList.java:1016)
      	at java.util.ArrayList.subList(ArrayList.java:1006)
      	at org.xwiki.diff.internal.DefaultDiffManager.extractConflictPart(DefaultDiffManager.java:473)
      	at org.xwiki.diff.internal.DefaultDiffManager.logConflict(DefaultDiffManager.java:508)
      	at org.xwiki.diff.internal.DefaultDiffManager.merge(DefaultDiffManager.java:367)
      	at org.xwiki.diff.internal.DefaultDiffManager.merge(DefaultDiffManager.java:145)
      

        Attachments

          Issue Links

            Activity

              People

              Assignee:
              surli Simon Urli
              Reporter:
              surli Simon Urli
              Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

                Dates

                Created:
                Updated:
                Resolved: