From 4e62703a660b521d22f72dcaad9a973759c5a09e Mon Sep 17 00:00:00 2001 From: Aron Roberts Date: Mon, 7 Mar 2011 23:25:03 +0000 Subject: [PATCH] CSPACE-3621: Minor cleanup of potentially ambiguous variable names. --- .../common/init/ModifyFieldDatatypes.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/services/common/src/main/java/org/collectionspace/services/common/init/ModifyFieldDatatypes.java b/services/common/src/main/java/org/collectionspace/services/common/init/ModifyFieldDatatypes.java index bde2aeaa4..024b13c85 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/init/ModifyFieldDatatypes.java +++ b/services/common/src/main/java/org/collectionspace/services/common/init/ModifyFieldDatatypes.java @@ -171,19 +171,23 @@ public class ModifyFieldDatatypes extends InitHandler implements IInitHandler { // Even as the current hack, this logic should reside in Field, not here. private String getDatabaseName(Field field) { - String databaseName = field.getTable(); - String[] databaseAndTable = databaseName.split("\\.", 2); - if (! databaseAndTable[0].isEmpty()) { - databaseName = databaseAndTable[0]; + String databaseName = ""; + String[] databaseAndTableNames = field.getTable().split("\\.", 2); + if (! databaseAndTableNames[0].isEmpty()) { + databaseName = databaseAndTableNames[0]; + } else { + databaseName = field.getTable(); } return databaseName; } private String getTableName(Field field) { - String tableName = field.getTable(); - String[] databaseAndTable = tableName.split("\\.", 2); - if (! databaseAndTable[1].isEmpty()) { - tableName = databaseAndTable[1]; + String tableName = ""; + String[] databaseAndTableNames = field.getTable().split("\\.", 2); + if (! databaseAndTableNames[1].isEmpty()) { + tableName = databaseAndTableNames[1]; + } else { + tableName = field.getTable(); } return tableName; } -- 2.47.3