You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ja...@apache.org on 2009/04/04 22:57:10 UTC

svn commit: r762006 - in /incubator/jspwiki/trunk: ChangeLog src/java/org/apache/wiki/JCRWikiPage.java src/java/org/apache/wiki/Release.java

Author: jalkanen
Date: Sat Apr  4 20:57:10 2009
New Revision: 762006

URL: http://svn.apache.org/viewvc?rev=762006&view=rev
Log:
Fixed JCRWikiPage.getChildren() to properly return an empty list in case there are no children.

Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/src/java/org/apache/wiki/JCRWikiPage.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=762006&r1=762005&r2=762006&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sat Apr  4 20:57:10 2009
@@ -1,3 +1,11 @@
+2009-04-04  Janne Jalkanen <ja...@apache.org>
+
+        * 3.0.0-svn-92
+        
+        * Fixed JCRWikiPage.getChildren(). Now you can kinda deploy
+        JSPWiki, but it's useless since if the main page is missing,
+        everything just breaks down.
+        
 2009-03-31  Janne Jalkanen <ja...@apache.org>
 
         * 3.0.0-svn-91

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/JCRWikiPage.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/JCRWikiPage.java?rev=762006&r1=762005&r2=762006&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/JCRWikiPage.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/JCRWikiPage.java Sat Apr  4 20:57:10 2009
@@ -614,6 +614,10 @@
                 pages.add( new JCRWikiPage( m_engine, iter.nextNode() ) );
             }
         }
+        catch( PathNotFoundException e )
+        {
+            return new ArrayList<WikiPage>();
+        }
         catch( RepositoryException e )
         {
             throw new ProviderException("Unable to list children",e);

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java?rev=762006&r1=762005&r2=762006&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Sat Apr  4 20:57:10 2009
@@ -77,7 +77,7 @@
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "91";
+    public static final String     BUILD         = "92";
     
     /**
      *  This is the generic version string you should use