storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject [1/3] storm git commit: Merge branch 'utf8splash' of https://github.com/ashnazg/storm into STORM-1180
Date Fri, 06 Nov 2015 20:20:59 GMT
Repository: storm
Updated Branches:
  refs/heads/0.10.x-branch 6c662e337 -> e932fb1b5


Merge branch 'utf8splash' of https://github.com/ashnazg/storm into STORM-1180

STORM-1180: FLUX logo wasn't appearing quite right


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5c3ed16c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5c3ed16c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5c3ed16c

Branch: refs/heads/0.10.x-branch
Commit: 5c3ed16c91687cf7567344fc32a72085413042ce
Parents: 6c662e3
Author: Robert (Bobby) Evans <evans@yahoo-inc.com>
Authored: Fri Nov 6 13:10:20 2015 -0600
Committer: Robert (Bobby) Evans <evans@yahoo-inc.com>
Committed: Fri Nov 6 14:12:55 2015 -0600

----------------------------------------------------------------------
 .../flux/flux-core/src/main/java/org/apache/storm/flux/Flux.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/5c3ed16c/external/flux/flux-core/src/main/java/org/apache/storm/flux/Flux.java
----------------------------------------------------------------------
diff --git a/external/flux/flux-core/src/main/java/org/apache/storm/flux/Flux.java b/external/flux/flux-core/src/main/java/org/apache/storm/flux/Flux.java
index 6300631..71c20a7 100644
--- a/external/flux/flux-core/src/main/java/org/apache/storm/flux/Flux.java
+++ b/external/flux/flux-core/src/main/java/org/apache/storm/flux/Flux.java
@@ -253,7 +253,8 @@ public class Flux {
         // banner
         InputStream is = Flux.class.getResourceAsStream("/splash.txt");
         if(is != null){
-            BufferedReader br = new BufferedReader(new InputStreamReader(is));
+            InputStreamReader isr = new InputStreamReader(is, "UTF-8");
+            BufferedReader br = new BufferedReader(isr);
             String line = null;
             while((line = br.readLine()) != null){
                 System.out.println(line);


Mime
View raw message