MONDRIAN

Since canAccess is called mostly with a Member, make the Member test first. [git-p4: depot-paths = "//open/mondrian/": change = 8982]
pentaho · Mar 29, 2007 · 42695cf · 42695cf
1 parent 78c6285
commit 42695cf
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/main/mondrian/olap/RoleImpl.java b/src/main/mondrian/olap/RoleImpl.java
@@ -508,18 +508,18 @@ public Access getAccess(NamedSet set) {
      */
     public boolean canAccess(OlapElement olapElement) {
         Util.assertPrecondition(olapElement != null, "olapElement != null");
-        if (olapElement instanceof Cube) {
-            return getAccess((Cube) olapElement) != Access.NONE;
-        } else if (olapElement instanceof Dimension) {
-            return getAccess((Dimension) olapElement) != Access.NONE;
-        } else if (olapElement instanceof Hierarchy) {
-            return getAccess((Hierarchy) olapElement) != Access.NONE;
+        if (olapElement instanceof Member) {
+            return getAccess((Member) olapElement) != Access.NONE;
         } else if (olapElement instanceof Level) {
             return getAccess((Level) olapElement) != Access.NONE;
-        } else if (olapElement instanceof Member) {
-            return getAccess((Member) olapElement) != Access.NONE;
         } else if (olapElement instanceof NamedSet) {
             return getAccess((NamedSet) olapElement) != Access.NONE;
+        } else if (olapElement instanceof Hierarchy) {
+            return getAccess((Hierarchy) olapElement) != Access.NONE;
+        } else if (olapElement instanceof Cube) {
+            return getAccess((Cube) olapElement) != Access.NONE;
+        } else if (olapElement instanceof Dimension) {
+            return getAccess((Dimension) olapElement) != Access.NONE;
         } else {
             return false;
         }