Author: metskem
Date: Sat Dec 21 17:23:43 2013
New Revision: 1552926
URL: http://svn.apache.org/r1552926
Log:
2013-12-21 Harry Metske ([email protected])
* 2.10.1-svn-1
* JSPWIKI-807: VersioningFileProvider pageExist failure to properly
handle latest version
Modified:
jspwiki/trunk/ChangeLog
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java
Modified: jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1552926&r1=1552925&r2=1552926&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Sat Dec 21 17:23:43 2013
@@ -1,3 +1,10 @@
+2013-12-21 Harry Metske ([email protected])
+
+ * 2.10.1-svn-1
+
+ * JSPWIKI-807: VersioningFileProvider pageExist failure to properly
handle latest version
+
+
2013-12-17 Juan Pablo Santos (juanpablo AT apache DOT org)
* 2.10.0 - first RC
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1552926&r1=1552925&r2=1552926&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
(original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Sat
Dec 21 17:23:43 2013
@@ -52,7 +52,7 @@ public final class Release {
* <p>
* If the POSTFIX is empty, it is not added to the version string.
*/
- private static final String POSTFIX = "";
+ private static final String POSTFIX = "svn";
/** The JSPWiki major version. */
public static final int VERSION = 2;
@@ -72,7 +72,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "";
+ public static final String BUILD = "1";
/**
* This is the generic version string you should use when printing out
the version. It is of
Modified:
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java
URL:
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java?rev=1552926&r1=1552925&r2=1552926&view=diff
==============================================================================
---
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java
(original)
+++
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java
Sat Dec 21 17:23:43 2013
@@ -585,6 +585,10 @@ public class VersioningFileProvider
*/
public boolean pageExists( String pageName, int version )
{
+ if (version == WikiPageProvider.LATEST_VERSION) {
+ return pageExists(pageName);
+ }
+
File dir = findOldPageDir( pageName );
if( !dir.exists() || !dir.isDirectory() )
