You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2014/03/17 21:20:11 UTC
svn commit: r1578545 - in /jspwiki/trunk: ChangeLog
jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki-war/src/main/java/org/apache/wiki/auth/AuthenticationManager.java
Author: metskem
Date: Mon Mar 17 20:20:10 2014
New Revision: 1578545
URL: http://svn.apache.org/r1578545
Log:
2014-03-17 Harry Metske (metskem@apache.org)
* 2.10.1-svn-12
* Fixed JSPWIKI-833 - temp policy file is created with wrong content (thanks to Dietrich Schmidt)
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/auth/AuthenticationManager.java
Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1578545&r1=1578544&r2=1578545&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Mon Mar 17 20:20:10 2014
@@ -1,3 +1,9 @@
+2014-03-17 Harry Metske (metskem@apache.org)
+
+ * 2.10.1-svn-12
+
+ * Fixed JSPWIKI-833 - temp policy file is created with wrong content (thanks to Dietrich Schmidt)
+
2014-03-11 Harry Metske (metskem@apache.org)
* Fixed JSPWIKI-823 - set java.io.tmpdir to ${project.build.directory} in pom.xml
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=1578545&r1=1578544&r2=1578545&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 Mon Mar 17 20:20:10 2014
@@ -72,7 +72,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "11";
+ public static final String BUILD = "12";
/**
* 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/auth/AuthenticationManager.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthenticationManager.java?rev=1578545&r1=1578544&r2=1578545&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthenticationManager.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/auth/AuthenticationManager.java Mon Mar 17 20:20:10 2014
@@ -645,10 +645,9 @@ public class AuthenticationManager {
os = new FileOutputStream(tmpFile);
byte[] buff = new byte[1024];
-
- while( is.read(buff) != -1 )
- {
- os.write(buff);
+ int bytes = 0;
+ while ((bytes = is.read(buff)) != -1) {
+ os.write(buff, 0, bytes);
}
path = tmpFile.toURI().toURL();