0002343: A load script doesn't fire the error script if the schema is…

… left blank on Oracle
JumpMind · Jul 31, 2015 · 93efb91 · 93efb91
1 parent facb725
commit 93efb91
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/LoadFilterService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/LoadFilterService.java
@@ -118,9 +118,23 @@ protected void refreshCache() {
                         } else if (ignoreCase) {
                             tableName = tableName.toUpperCase();
                         }
+
+                        String schemaName = loadFilter.getTargetSchemaName();
+                        if (StringUtils.isBlank(schemaName)) {
+                            schemaName = FormatUtils.WILDCARD;
+                        } else if (ignoreCase) {
+                            schemaName = schemaName.toUpperCase();
+                        }
+
+                        String catalogName = loadFilter.getTargetCatalogName();
+                        if (StringUtils.isBlank(catalogName)) {
+                            catalogName = FormatUtils.WILDCARD;
+                        } else if (ignoreCase) {
+                            catalogName = catalogName.toUpperCase();
+                        }
+
                         String qualifiedName = Table.getFullyQualifiedTableName(
-                                loadFilter.getTargetCatalogName(),
-                                loadFilter.getTargetSchemaName(), tableName);
+                                catalogName, schemaName, tableName);
                         List<LoadFilter> loadFiltersForTable = loadFiltersByTable.get(qualifiedName);
                         if (loadFiltersForTable == null) {
                             loadFiltersForTable = new ArrayList<LoadFilter>();