Author: ajaquith
Date: Mon Sep 7 03:27:38 2009
New Revision: 811981
URL: http://svn.apache.org/viewvc?rev=811981&view=rev
Log:
[JSPWIKI-599]: fixed NPEs in DefaultWikiContext.
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/DefaultWikiContext.java
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/DefaultWikiContext.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/DefaultWikiContext.java?rev=811981&r1=811980&r2=811981&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/DefaultWikiContext.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/DefaultWikiContext.java
Mon Sep 7 03:27:38 2009
@@ -129,8 +129,8 @@
copy.m_variableMap = (HashMap<String, Object>)
m_variableMap.clone();
copy.m_request = m_request;
copy.m_session = m_session;
- copy.m_page = (WikiPage) m_page.clone();
- copy.m_realPage = (WikiPage) m_realPage.clone();
+ copy.m_page = m_page == null ? null : (WikiPage) m_page.clone();
+ copy.m_realPage = m_realPage == null ? null : (WikiPage)
m_realPage.clone();
return copy;
}
catch( CloneNotSupportedException e )
