[Engine-patches] Change in ovirt-engine[master]: userportal, webadmin: fix LocaleFilter

[awels]

Alexander Wels has uploaded a new change for review.

Change subject: userportal,webadmin: fix LocaleFilter
......................................................................

userportal,webadmin: fix LocaleFilter

- Fixed a potential resource leak in LocaleFilter. The inputstream was
opened but never closed.
- Conformed the location of languages.properties to the same layout
as other properties files.

Change-Id: I57d895d44c463c835d396bf2c83e2a580d079688
Signed-off-by: Alexander Wels <aw...@redhat.com>
---
M 
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/LocaleFilter.java
R backend/manager/modules/utils/src/main/resources/languages.properties
2 files changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/03/15703/1

diff --git 
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/LocaleFilter.java
 
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/LocaleFilter.java
index 65ce75f..07b62b4 100644
--- 
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/LocaleFilter.java
+++ 
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/LocaleFilter.java
@@ -19,6 +19,7 @@
 
 import org.apache.log4j.Logger;
 import org.ovirt.engine.core.utils.LocaleUtils;
+import org.ovirt.engine.core.utils.ResourceUtils;
 
 /**
  * This filter attempts to detect the locale of the user based on the 
following criteria.
@@ -146,7 +147,7 @@
     private static Properties getLanguageProperties() {
         Properties prop = new Properties();
         try {
-            prop.load(LocaleFilter.class.getResourceAsStream(LANGUAGES_FILE));
+            prop = ResourceUtils.loadProperties(LocaleFilter.class, 
LANGUAGES_FILE);
         } catch (IOException e) {
             log.error("Unable to load supported langauges file", e);
         }
diff --git 
a/backend/manager/modules/utils/src/main/resources/org/ovirt/engine/core/utils/servlet/languages.properties
 b/backend/manager/modules/utils/src/main/resources/languages.properties
similarity index 100%
rename from 
backend/manager/modules/utils/src/main/resources/org/ovirt/engine/core/utils/servlet/languages.properties
rename to backend/manager/modules/utils/src/main/resources/languages.properties


-- 
To view, visit http://gerrit.ovirt.org/15703
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I57d895d44c463c835d396bf2c83e2a580d079688
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alexander Wels <aw...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches