You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2020/01/16 23:07:31 UTC

[jspwiki] 11/26: fix bug from previous refactor: parsed WikiDocument containing title must have the associated WikiContext

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit 4e2ca7168f554bdf0821f9cd1a0e836c19f390b6
Author: juanpablo <ju...@apache.org>
AuthorDate: Mon Jan 13 21:20:52 2020 +0100

    fix bug from previous refactor: parsed WikiDocument containing title must have the associated WikiContext
---
 .../src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/jspwiki-main/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java b/jspwiki-main/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
index 567e65c..178e468 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
@@ -848,11 +848,13 @@ public class JSPWikiMarkupParser extends MarkupParser {
         try {
             final JSPWikiMarkupParser dtr = getCleanTranslator();
             dtr.setInputReader( new StringReader( title ) );
+            final WikiDocument doc = dtr.parse();
+            doc.setContext( m_context );
 
-            return XmlUtil.extractTextFromDocument( dtr.parse() );
+            return XmlUtil.extractTextFromDocument( doc );
         } catch( final IOException e ) {
-            log.fatal("CleanTranslator not working", e );
-            throw new InternalWikiException( "CleanTranslator not working as expected, when cleaning title"+ e.getMessage() , e );
+            log.fatal("Title parsing not working", e );
+            throw new InternalWikiException( "Xml text extraction not working as expected when cleaning title" + e.getMessage() , e );
         }
     }