You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by aj...@apache.org on 2009/04/20 00:19:24 UTC
svn commit: r766530 - in /incubator/jspwiki/trunk/src/java/org/apache/wiki:
NoSuchVariableException.java VariableManager.java
Author: ajaquith
Date: Sun Apr 19 22:19:24 2009
New Revision: 766530
URL: http://svn.apache.org/viewvc?rev=766530&view=rev
Log:
Fixed NPE in VariableManager.
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/NoSuchVariableException.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/VariableManager.java
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/NoSuchVariableException.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/NoSuchVariableException.java?rev=766530&r1=766529&r2=766530&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/NoSuchVariableException.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/NoSuchVariableException.java Sun Apr 19 22:19:24 2009
@@ -23,20 +23,30 @@
import org.apache.wiki.api.WikiException;
/**
- * Marks that no such variable was located.
+ * Marks that no such variable was located.
*/
-public class NoSuchVariableException
- extends WikiException
+public class NoSuchVariableException extends WikiException
{
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
/**
- * Constructs an exception.
- *
- * @param msg Message to show
+ * Constructs an exception.
+ *
+ * @param msg Message to show
*/
public NoSuchVariableException( String msg )
{
- super(msg);
+ super( msg );
+ }
+
+ /**
+ * Constructs an exception.
+ *
+ * @param msg Message to show
+ * @param cause the cause of the exception
+ */
+ public NoSuchVariableException( String msg, Throwable cause )
+ {
+ super( msg, cause );
}
}
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/VariableManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/VariableManager.java?rev=766530&r1=766529&r2=766530&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/VariableManager.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/VariableManager.java Sun Apr 19 22:19:24 2009
@@ -388,7 +388,7 @@
}
catch( Exception e )
{
- log.info("Interesting exception: cannot fetch variable value",e);
+ log.info( "Interesting exception: cannot fetch variable value '" + varName + "'.", e );
}
return "";
}
@@ -420,7 +420,8 @@
public String getPagename()
{
- return m_context.getPage().getName();
+ WikiPage page = m_context.getPage();
+ return page == null ? null : page.getName();
}
public String getApplicationname()