You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2019/04/26 12:30:38 UTC
svn commit: r1858196 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntry.java
Author: angela
Date: Fri Apr 26 12:30:38 2019
New Revision: 1858196
URL: http://svn.apache.org/viewvc?rev=1858196&view=rev
Log:
OAK-8263 : Simplify PermissionEntry.compareTo
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntry.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntry.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntry.java?rev=1858196&r1=1858195&r2=1858196&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntry.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntry.java Fri Apr 26 12:30:38 2019
@@ -84,13 +84,7 @@ final class PermissionEntry implements C
public int compareTo(@NotNull PermissionEntry pe) {
if (Objects.equal(path, pe.path)) {
// reverse order
- if (index == pe.index) {
- return 0;
- } else if (index < pe.index) {
- return 1;
- } else {
- return -1;
- }
+ return Integer.compare(pe.index, index);
} else {
final int depth = PathUtils.getDepth(path);
final int otherDepth = PathUtils.getDepth(pe.path);