Author: jalkanen
Date: Sat May 31 02:14:57 2008
New Revision: 661989
URL: http://svn.apache.org/viewvc?rev=661989&view=rev
Log:
Added an extra sanity check to plugin parsing.
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java?rev=661989&r1=661988&r2=661989&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
Sat May 31 02:14:57 2008
@@ -1414,10 +1414,16 @@
PluginContent pluginContent =
m_engine.getPluginManager().parsePluginLine( m_context,
linktext,
pos );
+ //
+ // This might sometimes fail, especially if there is
something which looks
+ // like a plugin invocation but is really not.
+ //
+ if( pluginContent != null )
+ {
+ addElement( pluginContent );
- addElement( pluginContent );
-
- pluginContent.executeParse( m_context );
+ pluginContent.executeParse( m_context );
+ }
}
catch( PluginException e )
{
