From 542d6f9980514027bfac00cee2405d624f89cc10 Mon Sep 17 00:00:00 2001 From: hzzz Date: Tue, 9 May 2017 11:40:54 +0800 Subject: [PATCH 1/2] fix --- .../src/com/fr/design/data/DesignTableDataManager.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/designer_base/src/com/fr/design/data/DesignTableDataManager.java b/designer_base/src/com/fr/design/data/DesignTableDataManager.java index 3f67d6d4c..3b4877154 100644 --- a/designer_base/src/com/fr/design/data/DesignTableDataManager.java +++ b/designer_base/src/com/fr/design/data/DesignTableDataManager.java @@ -381,9 +381,7 @@ public abstract class DesignTableDataManager { Env currentEnv = FRContext.getCurrentEnv(); ParameterProvider[] parameters = currentEnv.getTableDataParameters(tabledata); if (ArrayUtils.isEmpty(parameters)) { - ParameterProvider[] tableDataParameter = tabledata.getParameters(Calculator.createCalculator()); - checkArgument(!ArrayUtils.isEmpty(tableDataParameter), "both parameters and tableDataParameter are empty"); - parameters = tableDataParameter; + parameters = tabledata.getParameters(Calculator.createCalculator()); } boolean hasValue = true; for (ParameterProvider parameter : parameters) { From 8b8e30196ba1b8e8a7381db9b1b1d694fdef27c0 Mon Sep 17 00:00:00 2001 From: hzzz Date: Tue, 9 May 2017 11:44:37 +0800 Subject: [PATCH 2/2] remove unused code --- .../src/com/fr/design/data/DesignTableDataManager.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/designer_base/src/com/fr/design/data/DesignTableDataManager.java b/designer_base/src/com/fr/design/data/DesignTableDataManager.java index 3b4877154..c2e039a44 100644 --- a/designer_base/src/com/fr/design/data/DesignTableDataManager.java +++ b/designer_base/src/com/fr/design/data/DesignTableDataManager.java @@ -491,10 +491,4 @@ public abstract class DesignTableDataManager { public static void setThreadLocal(String value) { threadLocal.set(value); } - - private static void checkArgument(boolean expression, String errorMessage) { - if (!expression) { - throw new IllegalArgumentException(errorMessage); - } - } } \ No newline at end of file