merge and fix conflicts

1 files changed, 3 insertions, 1 deletions

diff --git a/java/examples/datatypes/H5Ex_T_FloatAttribute.java b/java/examples/datatypes/H5Ex_T_FloatAttribute.java
index 2e706d9..12831bc 100644
--- a/java/examples/datatypes/H5Ex_T_FloatAttribute.java
+++ b/java/examples/datatypes/H5Ex_T_FloatAttribute.java
@@ -22,6 +22,8 @@
 package examples.datatypes;
 
 import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.util.Locale;
 
 import hdf.hdf5lib.H5;
 import hdf.hdf5lib.HDF5Constants;
@@ -201,7 +203,7 @@ public class H5Ex_T_FloatAttribute {
         }
 
         // Output the data to the screen.
-        DecimalFormat df = new DecimalFormat("#,##0.0000");
+        DecimalFormat df = new DecimalFormat("#,##0.0000", new DecimalFormatSymbols(Locale.US));
         System.out.println(ATTRIBUTENAME + ":");
         for (int indx = 0; indx < dims[0]; indx++) {
             System.out.print(" [");