MONDRIAN

Making a couple of common equals() methods faster. [git-p4: depot-paths = "//open/mondrian/": change = 8751]
pentaho · Feb 19, 2007 · 76edaf3 · 76edaf3
1 parent 94cc16a
commit 76edaf3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/main/mondrian/olap/OlapElementBase.java b/src/main/mondrian/olap/OlapElementBase.java
@@ -34,8 +34,8 @@ protected OlapElementBase() {
     protected abstract Logger getLogger();
 
     public boolean equals(Object o) {
-        return (o instanceof OlapElement) &&
-                equals((OlapElement) o);
+        return (o == this) ||
+            ((o instanceof OlapElement) && equals((OlapElement) o));
     }
 
     public boolean equals(OlapElement mdxElement) {

diff --git a/src/main/mondrian/rolap/RolapHierarchy.java b/src/main/mondrian/rolap/RolapHierarchy.java
@@ -241,12 +241,12 @@ protected Logger getLogger() {
     }
 
     public boolean equals(Object o) {
-        if (!(o instanceof RolapHierarchy)) {
-            return false;
-        }
         if (this == o) {
             return true;
         }
+        if (!(o instanceof RolapHierarchy)) {
+            return false;
+        }
 
         RolapHierarchy that = (RolapHierarchy)o;
         if (sharedHierarchyName == null || that.sharedHierarchyName == null) {

diff --git a/src/main/mondrian/rolap/RolapMember.java b/src/main/mondrian/rolap/RolapMember.java
@@ -334,8 +334,8 @@ public RolapMember getParentMember() {
     }
 
     public boolean equals(Object o) {
-        return (o instanceof RolapMember) &&
-                equals((RolapMember) o);
+        return (o == this) || 
+                ((o instanceof RolapMember) && equals((RolapMember) o));
     }
 
     public boolean equals(OlapElement o) {