Hello Alexander Wels,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/35267
to review the following change.
Change subject: engine: Invalid locale found in configuration ''
......................................................................
engine: Invalid locale found in configuration ''
- Fixed info message warning showing up in log. This was due
to missing entry in database, and missing check for blank.
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1165073
Change-Id: Icae51fdd5427069281ac3d2147af797813228edb
Signed-off-by: Alexander Wels <[email protected]>
---
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/UnsupportedLocaleHelper.java
M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
2 files changed, 13 insertions(+), 8 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/67/35267/1
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/UnsupportedLocaleHelper.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/UnsupportedLocaleHelper.java
index 6bf3bb5..00b846d 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/UnsupportedLocaleHelper.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/UnsupportedLocaleHelper.java
@@ -5,6 +5,7 @@
import java.util.List;
import org.apache.commons.lang.LocaleUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.ovirt.engine.core.common.config.Config;
import org.ovirt.engine.core.common.config.ConfigValues;
@@ -56,14 +57,16 @@
List<String> result = new ArrayList<String>();
if (locales != null && !locales.isEmpty()) {
for (String localeKey: locales) {
- try {
- //Check for valid locale.
- String underScoredLocaleKey = localeKey.replaceAll("-",
"_");
- LocaleUtils.toLocale(underScoredLocaleKey);
- result.add(underScoredLocaleKey);
- } catch (IllegalArgumentException iae) {
- //The locale passed in is not valid, don't add it to the
list.
- log.info("Invalid locale found in configuration: " +
localeKey); //$NON-NLS-1$
+ if (!StringUtils.isBlank(localeKey)) {
+ try {
+ //Check for valid locale.
+ String underScoredLocaleKey =
localeKey.replaceAll("-", "_");
+ LocaleUtils.toLocale(underScoredLocaleKey);
+ result.add(underScoredLocaleKey);
+ } catch (IllegalArgumentException iae) {
+ //The locale passed in is not valid, don't add it to
the list.
+ log.info("Invalid locale found in configuration: " +
localeKey); //$NON-NLS-1$
+ }
}
}
}
diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
index 8974281..11f579a 100644
--- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
+++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
@@ -838,6 +838,8 @@
select fn_db_add_config_value('SupportNUMAMigration','false','general');
+select fn_db_add_config_value('UnsupportedLocalesFilter','','general');
+
------------------------------------------------------------------------------------
-- Update with override section
------------------------------------------------------------------------------------
--
To view, visit http://gerrit.ovirt.org/35267
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icae51fdd5427069281ac3d2147af797813228edb
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5
Gerrit-Owner: Alon Bar-Lev <[email protected]>
Gerrit-Reviewer: Alexander Wels <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
