XWiki Platform
  1. XWiki Platform
  2. XWIKI-10620

Unable to resolve wikiReference on document conflict

    Details

    • Difficulty:
      Easy
    • Documentation:
      N/A
    • Documentation in Release Notes:
      N/A
    • Similar issues:

      Description

      The issue occurs while running the DW and you arrive at the point where you have a document conflict.
      When trying to display that document and the list of possible options to take a velocity error about NullPointerException is shown.
      My two cents is that this happens because the script is trying to get a wikiReference from a local object that does not have the wiki parameter set.

      Location of problem: displayDocumentReference macro in extension.vm
      Stack trace: https://ezcrypt.it/bY8n#pfPbimotWNpmWNaylbluzhCK
      Possible solution: https://github.com/vrachieru/xwiki-platform/commit/d5b1ae33aa285d2303aa617316da7c9f6b6c3d50

        Activity

        Hide
        Thomas Mortagne added a comment -

        Are you saying that you get always get a nullpointer in case of conflict in DW ? That sounds like quite a blocker to me.

        Show
        Thomas Mortagne added a comment - Are you saying that you get always get a nullpointer in case of conflict in DW ? That sounds like quite a blocker to me.
        Hide
        Victor Rachieru added a comment -

        I'm unsure if this happens for every conflict.
        In my case it crashed on the first one and then I had to do the fix.
        After I merged the file on which I got the error I did not revert the .vm to it's original state to see if it does the same for other files but I guess it would do the same provided they are local documents and don't have the wiki parameter set.

        Show
        Victor Rachieru added a comment - I'm unsure if this happens for every conflict. In my case it crashed on the first one and then I had to do the fix. After I merged the file on which I got the error I did not revert the .vm to it's original state to see if it does the same for other files but I guess it would do the same provided they are local documents and don't have the wiki parameter set.
        Hide
        Thomas Mortagne added a comment - - edited

        Ok it's only log displayer (from the description I tough it was breaking the whole conflict UI) so it's not a blocker.

        Show
        Thomas Mortagne added a comment - - edited Ok it's only log displayer (from the description I tough it was breaking the whole conflict UI) so it's not a blocker.
        Hide
        Eduard Moraru added a comment - - edited

        Applied pull request https://github.com/xwiki/xwiki-platform/pull/300 without changes.

        Thanks for the contribution!

        Show
        Eduard Moraru added a comment - - edited Applied pull request https://github.com/xwiki/xwiki-platform/pull/300 without changes. Thanks for the contribution!
        Hide
        Eduard Moraru added a comment -

        Did not apply to the stable-6.1.x branch because of the layout changes introduced by XWIKI-10670 that cause conflicts in the cherry-pick operation.

        Show
        Eduard Moraru added a comment - Did not apply to the stable-6.1.x branch because of the layout changes introduced by XWIKI-10670 that cause conflicts in the cherry-pick operation.

          People

          • Assignee:
            Victor Rachieru
            Reporter:
            Victor Rachieru
          • Votes:
            0 Vote for this issue
            Watchers:
            3 Start watching this issue

            Dates

            • Created:
              Updated:
              Resolved:
              Date of First Response: