Mercurial > hg > icedtea9-forest > jdk
changeset 2833:4aaac9fb2293
Merge
author | yhuang |
---|---|
date | Mon, 13 Sep 2010 02:54:35 -0700 |
parents | 8f5a6ea8c9e9 (current diff) 9a1549d682ce (diff) |
children | 176586cd040e |
files | |
diffstat | 2 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Sep 09 16:26:46 2010 -0700 +++ b/.hgtags Mon Sep 13 02:54:35 2010 -0700 @@ -82,3 +82,5 @@ 3b0abcb512807bb6f6d27755bc50103211bde6ee jdk7-b105 b91ef6b60f4e19bf4592c6dd594c9bac62487519 jdk7-b106 882103f334bb23745d3fd70fb7928c347478b0f4 jdk7-b107 +17a5d84b75610255a3527e8ede1da19c91ba7a7e jdk7-b108 +ab0d3f54a63f2aadfcdd2e14b81f79362ce454e2 jdk7-b109
--- a/src/share/classes/sun/tools/jconsole/resources/JConsoleResources.java Thu Sep 09 16:26:46 2010 -0700 +++ b/src/share/classes/sun/tools/jconsole/resources/JConsoleResources.java Mon Sep 13 02:54:35 2010 -0700 @@ -447,7 +447,9 @@ String ls = System.getProperty("line.separator"); for(int i=0;i<temp.length;i++) { + if (temp[i][1] instanceof String){ temp[i][1] = temp[i][1].toString().replaceAll("\n",ls); + } } return temp;