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 index e515485562..78ee7aff36 100644 --- 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 loadFiltersForTable = loadFiltersByTable.get(qualifiedName); if (loadFiltersForTable == null) { loadFiltersForTable = new ArrayList();