You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ni...@apache.org on 2007/12/28 21:43:59 UTC
svn commit: r607326 - in /lucene/hadoop/branches/branch-0.15: CHANGES.txt
src/java/org/apache/hadoop/fs/FsShell.java
Author: nigel
Date: Fri Dec 28 12:43:58 2007
New Revision: 607326
URL: http://svn.apache.org/viewvc?rev=607326&view=rev
Log:
Merge -r 607324:607325 from trunk to branch-0.15. Fixes HADOOP-2456
Modified:
lucene/hadoop/branches/branch-0.15/CHANGES.txt
lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/fs/FsShell.java
Modified: lucene/hadoop/branches/branch-0.15/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/CHANGES.txt?rev=607326&r1=607325&r2=607326&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.15/CHANGES.txt (original)
+++ lucene/hadoop/branches/branch-0.15/CHANGES.txt Fri Dec 28 12:43:58 2007
@@ -43,6 +43,10 @@
for merging, this patch will ensure that only those files whose checksums
have also got created (renamed) are returned. (ddas)
+ HADOOP-2456. Hardcode English locale to prevent NumberFormatException
+ from occurring when starting the NameNode with certain locales.
+ (Matthias Friedrich via nigel)
+
IMPROVEMENTS
HADOOP-2160. Remove project-level, non-user documentation from
Modified: lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/fs/FsShell.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/fs/FsShell.java?rev=607326&r1=607325&r2=607326&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/fs/FsShell.java (original)
+++ lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/fs/FsShell.java Fri Dec 28 12:43:58 2007
@@ -20,6 +20,7 @@
import java.io.File;
import java.io.IOException;
import java.text.DecimalFormat;
+import java.text.NumberFormat;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -45,7 +46,12 @@
}
static final String SETREP_SHORT_USAGE="-setrep [-R] [-w] <rep> <path/file>";
static final String TAIL_USAGE="-tail [-f] <file>";
- private static final DecimalFormat decimalFormat = new DecimalFormat("#.##");
+ private static final DecimalFormat decimalFormat;
+ static {
+ NumberFormat numberFormat = NumberFormat.getNumberInstance(Locale.ENGLISH);
+ decimalFormat = (DecimalFormat) numberFormat;
+ decimalFormat.applyPattern("#.##");
+ }
/**
*/