commit 7648cacc80883cf19e13bdd9f7e3aacedf8d3808
author Simon Hunt <simon@onlab.us> Thu Jun 22 08:58:19 2017 -0700
committer Simon Hunt <simon@onlab.us> Thu Jun 22 09:32:37 2017 -0700
tree 52e4f77ad2f8d913e5e928ce582707e2196668fd
parent 17b4bcbcb9f4e38defefa80404e484854bab83df

UI-Lion: Fix for reading .properties files as UTF-8, when loading ResourceBundles.

Change-Id: I73d3f08c59788fba1b42954aced05eb3a3148009

web/gui/src/main/java/org/onosproject/ui/impl/lion/BundleStitcher.java

diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/lion/BundleStitcher.java b/web/gui/src/main/java/org/onosproject/ui/impl/lion/BundleStitcher.java
index b6671b8..f2fa27e 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/lion/BundleStitcher.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/lion/BundleStitcher.java
@@ -19,6 +19,7 @@
 
 import com.google.common.collect.ImmutableList;
 import org.onosproject.ui.lion.LionBundle;
+import org.onosproject.ui.lion.LionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -103,7 +104,7 @@
             //       for this to work under Karaf, apparently...
             Locale locale = Locale.getDefault();
             ClassLoader classLoader = getClass().getClassLoader();
-            bundle = ResourceBundle.getBundle(fqbn, locale, classLoader);
+            bundle = LionUtils.getBundledResource(fqbn, locale, classLoader);
 
         } catch (MissingResourceException e) {
             log.warn("Cannot find resource bundle: {}", fqbn);