You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2018/03/30 20:21:17 UTC
[jspwiki] 02/03: JSPWIKI-1039 / JSPWIKI-1067: ACLs are not taken
into account when cache is disabled / View-only ACLs are not enforced
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 28489c5c43a8cfa74fc4aa1ac669daa9b67d37b5
Author: juanpablo <ju...@apache.org>
AuthorDate: Fri Mar 30 22:20:05 2018 +0200
JSPWIKI-1039 / JSPWIKI-1067: ACLs are not taken into account when cache is disabled / View-only ACLs are not enforced
---
.../src/main/java/org/apache/wiki/auth/acl/DefaultAclManager.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
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 549f05a..8af8359 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
@@ -1,4 +1,4 @@
-/*
+/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
@@ -14,7 +14,7 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
*/
package org.apache.wiki.auth.acl;
@@ -184,9 +184,9 @@ public class DefaultAclManager implements AclManager {
m_engine.getHTML(ctx, page);
if (page.getAcl() == null) {
- acl = new AclImpl();
- page.setAcl(acl);
+ page.setAcl( new AclImpl() );
}
+ acl = page.getAcl();
}
}
--
To stop receiving notification emails like this one, please contact
juanpablo@apache.org.