Merge pull request pentaho#798 from stanislau-strelchanka/PSW-236

[PSW-236] Getting NullPointerException error when clicking on View > …
ppatricio · Dec 20, 2016 · 7e9dc11 · 7e9dc11
2 parents 0d27426 + b120891
commit 7e9dc11
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/mondrian/src/main/java/mondrian/olap/Mondrian.xml b/mondrian/src/main/java/mondrian/olap/Mondrian.xml
@@ -1326,7 +1326,7 @@ Revision is $Id$
             public boolean equals(Object o) {
                 if (o instanceof View) {
                     View that = (View) o;
-                    if (!this.alias.equals(that.alias)) {
+                    if (!Util.equals(this.alias, that.alias)) {
                         return false;
                     }
                     if (this.selects == null || that.selects == null || this.selects.length != that.selects.length) {

diff --git a/workbench/src/main/java/mondrian/olap/Mondrian_SW.xml b/workbench/src/main/java/mondrian/olap/Mondrian_SW.xml
@@ -1353,7 +1353,7 @@
             public boolean equals(Object o) {
                 if (o instanceof View) {
                     View that = (View) o;
-                    if (!this.alias.equals(that.alias)) {
+                    if (!Util.equals(this.alias, that.alias)) {
                         return false;
                     }
                     if (this.selects == null || that.selects == null || this.selects.length != that.selects.length) {