MONDRIAN: check for null to avoid null pointer in schema comparison

[git-p4: depot-paths = "//open/mondrian/": change = 11869]
pentaho · Oct 31, 2008 · c771db0 · c771db0
1 parent dc967f1
commit c771db0
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/src/main/mondrian/gui/JDBCMetaData.java b/src/main/mondrian/gui/JDBCMetaData.java
@@ -477,6 +477,10 @@ private void addDbTable(DbTable dbs) {
             tablesCount.put(dbs.name, count);
         }
 
+        private boolean schemaNameEquals(String a, String b) {
+            return (a != null && a.equals(b));
+        }
+
         private Vector<String> getAllSchemas() {
             if (allSchemas == null) {
                 allSchemas = new Vector<String>();
@@ -494,7 +498,7 @@ private boolean tableExists(String sname, String tableName) {
                 return tablesCount.containsKey(tableName);
             } else {
                 for (DbSchema s : schemas) {
-                    if (s.name.equals(sname)) {
+                    if (schemaNameEquals(s.name, sname)) {
                         for (DbTable d : s.tables) {
                             if (d.name.equals(tableName)) {
                                 return true;
@@ -518,7 +522,7 @@ private boolean colExists(String sname, String tableName, String colName) {
             } else {
                 // return a vector of "fk col name" string objects if schema is given
                 for (DbSchema s : schemas) {
-                    if (s.name.equals(sname)) {
+                    if (schemaNameEquals(s.name, sname)) {
                         for (DbTable t : s.tables) {
                             if (t.name.equals(tableName)) {
                                 return t.colsDataType.containsKey(colName);
@@ -548,7 +552,7 @@ private Vector<String> getAllTables(String sname) {
             } else {
                 // return a vector of "tablename" string objects
                 for (DbSchema s : schemas) {
-                    if (s.name.equals(sname)) {
+                    if (schemaNameEquals(s.name, sname)) {
                         for (DbTable d : s.tables) {
                             v.add(d.name);
                         }
@@ -577,7 +581,7 @@ private Vector<String> getFactTables(String sname) {
             } else {
                 // return a vector of "fact tablename" string objects if schema is given
                 for (DbSchema s : schemas) {
-                    if (s.name.equals(sname)) {
+                    if (schemaNameEquals(s.name, sname)) {
                         for (DbTable t : s.tables) {
                             if (t instanceof FactTable) {
                                 f.add(((FactTable) t).name);
@@ -622,7 +626,7 @@ private Vector<String> getFactTableFKs(String sname, String factTable) {
             } else {
                 // return a vector of "fk col name" string objects if schema is given
                 for (DbSchema s : schemas) {
-                    if (s.name.equals(sname)) {
+                    if (schemaNameEquals(s.name, sname)) {
                         for (DbTable t : s.tables) {
                             if (t instanceof FactTable && t.name
                                 .equals(factTable)) {
@@ -672,7 +676,7 @@ private Vector<String> getDimensionTables(String sname, String factTable) {
             } else {
                 // return a vector of "fk col name" string objects if schema is given
                 for (DbSchema s : schemas) {
-                    if (s.name.equals(sname)) {
+                    if (schemaNameEquals(s.name, sname)) {
                         for (DbTable t : s.tables) {
                             if (t instanceof FactTable && t.name
                                 .equals(factTable)) {
@@ -699,7 +703,7 @@ private String getTablePK(String sname, String tableName) {
             } else {
                 // return a vector of "fk col name" string objects if schema is given
                 for (DbSchema s : schemas) {
-                    if (s.name.equals(sname)) {
+                    if (schemaNameEquals(s.name, sname)) {
                         for (DbTable t : s.tables) {
                             if (t.name.equals(tableName)) {
                                 return t.pk;
@@ -743,7 +747,7 @@ private Vector<String> getAllColumns(String sname, String tableName) {
             } else {
                 // return a vector of "col name" string objects if schema is given
                 for (DbSchema s : schemas) {
-                    if (s.name.equals(sname)) {
+                    if (schemaNameEquals(s.name, sname)) {
                         for (DbTable t : s.tables) {
                             if (t.name.equals(tableName)) {
                                 f.addAll(t.colsDataType.keySet());
@@ -768,7 +772,7 @@ private int getColumnDataType(String sname, String tableName, String colName) {
             } else {
                 // return a vector of "fk col name" string objects if schema is given
                 for (DbSchema s : schemas) {
-                    if (s.name.equals(sname)) {
+                    if (schemaNameEquals(s.name, sname)) {
                         for (DbTable t : s.tables) {
                             if (t.name.equals(tableName)) {
                                 return Integer.parseInt(