[JSPWIKI-317] ExternalDiffProvider

• Type: Bug
• Status: Closed
• Priority: Minor
• Resolution: Fixed
• Affects Version/s: 2.6.3
• Fix Version/s: 2.7.x
• Component/s: Plugins

Environment

Solaris 10 Update 4, Sun Webserver 7.0u1, sun4v

• Assignee: Harry Metske
• Reporter: Jan Spitalnik
• Created: 18/Jul/08 11:53
• Updated: 15/Nov/21 13:49
• Resolved: 31/Jul/08 19:53

Description

Setting diff provider to ExternaDiff provider in properties file:

jspwiki.diffProvider = ExternalDiffProvider
jspwiki.diffCommand = /usr/bin/diff -u %s1 %s2

will not return the diff but "Invalid diff - probably something wrong with server setup." instead. The problem is in src/com/ecyrd/jspwiki/diff/ExternalDiffProvider.java file in makeDiffHtml() method.

if (m_traditionalColorization) //FIXME, see comment near declaration...
diff = colorizeDiff(diff);
else
diff = htmlWikiDiff;

diff is initialized to null, then we call 'diff = colorizeDiff(diff)'. At this point diff was never changed and is still null. colorizeDiff() will return above mentioned message. The fix is simple,
instead of passing diff to colorizeDiff we should pass htmlWikiDiff. As that variable contains the actuall diff.