jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mets...@apache.org
Subject [1/2] jspwiki git commit: * 2.10.3-git-31.
Date Sat, 21 Jan 2017 16:21:07 GMT
Repository: jspwiki
Updated Branches:
  refs/heads/master f183523d9 -> 97433effa


       * 2.10.3-git-31.

       * Fixed JSPWIKI-1047 - Access Control Lists do not work if page cache is deactivated
(thanks to E. Poth)


Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/a5d15c69
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/a5d15c69
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/a5d15c69

Branch: refs/heads/master
Commit: a5d15c6954a02948d8a6c08e519800c47f4c2718
Parents: f183523
Author: Harry Metske <harry.metske@gmail.com>
Authored: Sat Jan 21 17:12:15 2017 +0100
Committer: Harry Metske <harry.metske@gmail.com>
Committed: Sat Jan 21 17:12:15 2017 +0100

----------------------------------------------------------------------
 ChangeLog                                                      | 6 ++++++
 jspwiki-war/src/main/java/org/apache/wiki/Release.java         | 2 +-
 .../main/java/org/apache/wiki/auth/acl/DefaultAclManager.java  | 5 +----
 3 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jspwiki/blob/a5d15c69/ChangeLog
----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 535f4f8..be8b713 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-01-21  Harry Metske (metskem@apache.org)
+
+       * 2.10.3-git-31.
+
+       * Fixed JSPWIKI-1047 - Access Control Lists do not work if page cache is deactivated
(thanks to E. Poth)
+
 2017-01-21  Dirk Frederickx (brushed AT apache DOT org)
 
        * 2.10.3-git-30

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/a5d15c69/jspwiki-war/src/main/java/org/apache/wiki/Release.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/Release.java b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
index b7aef6b..d6d807d 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
@@ -72,7 +72,7 @@ public final class Release {
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "30";
+    public static final String     BUILD         = "31";
 
     /**
      *  This is the generic version string you should use when printing out the version.
 It is of

http://git-wip-us.apache.org/repos/asf/jspwiki/blob/a5d15c69/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/DefaultAclManager.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/DefaultAclManager.java b/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/DefaultAclManager.java
index 8668df3..549f05a 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/DefaultAclManager.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/auth/acl/DefaultAclManager.java
@@ -183,10 +183,7 @@ public class DefaultAclManager implements AclManager {
 
                 m_engine.getHTML(ctx, page);
 
-                page = m_engine.getPage(page.getName(), page.getVersion());
-                acl = page.getAcl();
-
-                if (acl == null) {
+                if (page.getAcl() == null) {
                     acl = new AclImpl();
                     page.setAcl(acl);
                 }


Mime
View raw message