MONDRIAN: [MONDRIAN-917] Fixes an issue with cubes and schema inherit…

…ance in the RoleImpl class.

[git-p4: depot-paths = "//open/mondrian/": change = 14511]

src/main/mondrian/olap/RoleImpl.java

@@ -144,8 +144,8 @@ public Access getAccess(Cube cube) {
         assert cube != null;
         // Check for explicit rules.
         // Both 'custom' and 'all' are good enough
-        Access access = toAccess(cubeGrants.get(cube));
-        if (access != Access.NONE) {
+        Access access = cubeGrants.get(cube);
+        if (access != null) {
             return access;
         }
         // Check for inheritance from the parent schema
@@ -158,36 +158,6 @@ public Access getAccess(Cube cube) {
         return Access.NONE;
     }
 
-    /**
-     * Removes the upper level restriction of each hierarchy in this role.
-     * This will allow member names to be resolved even if the upper levels
-     * are not visible.
-     *
-     * <p>For example, it should be possible to resolve
-     * [Store].[USA].[CA].[San Francisco] even if the role cannot see the
-     * nation level.
-     */
-    public void removeTopLevels() {
-        for (Map.Entry<Hierarchy, HierarchyAccessImpl> entry
-            : hierarchyGrants.entrySet())
-        {
-            final HierarchyAccessImpl hierarchyAccess = entry.getValue();
-            if (hierarchyAccess.topLevel != null) {
-                final HierarchyAccessImpl hierarchyAccessClone =
-                    new HierarchyAccessImpl(
-                        hierarchyAccess.role,
-                        hierarchyAccess.hierarchy,
-                        hierarchyAccess.access,
-                        null,
-                        hierarchyAccess.bottomLevel,
-                        hierarchyAccess.rollupPolicy);
-                hierarchyAccessClone.memberGrants.putAll(
-                    hierarchyAccess.memberGrants);
-                entry.setValue(hierarchyAccessClone);
-            }
-        }
-    }
-
     /**
      * Defines access to a dimension.
      *