0002145: Do a better job of table lookup when case is suppose to be i…

…gnored. Lookup across catalogs and schemas is now case insensitive
JumpMind · Jan 19, 2015 · 0865b26 · 0865b26
1 parent 98681fa
commit 0865b26
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/AbstractDatabasePlatform.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/AbstractDatabasePlatform.java
@@ -245,7 +245,7 @@ public Table readTableFromDatabase(String catalogName, String schemaName, String
             List<String> catalogNames = reader.getCatalogNames();
             if (catalogNames != null) {
             for (String name : catalogNames) {
-                if (name.equalsIgnoreCase(catalogName))  {
+                if (name != null && name.equalsIgnoreCase(catalogName))  {
                     catalogName = name;
                     break;
                 }
@@ -255,7 +255,7 @@ public Table readTableFromDatabase(String catalogName, String schemaName, String
             List<String> schemaNames = reader.getSchemaNames(catalogName);
             if (schemaNames != null) {
                 for (String name : schemaNames) {
-                    if (name.equalsIgnoreCase(schemaName))  {
+                    if (name != null && name.equalsIgnoreCase(schemaName))  {
                         schemaName = name;
                         break;
                     }
@@ -265,7 +265,7 @@ public Table readTableFromDatabase(String catalogName, String schemaName, String
             List<String> tableNames = reader.getTableNames(catalogName, schemaName, null);
             if (tableNames != null) {
                 for (String name : tableNames) {
-                    if (name.equalsIgnoreCase(tableName))  {
+                    if (name != null && name.equalsIgnoreCase(tableName))  {
                         tableName = name;
                         break;
                     }