Fix for DataFormatter on some JVMs

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@680394 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFDataFormatter.java b/src/java/org/apache/poi/hssf/usermodel/HSSFDataFormatter.java
index c1701e22b39aef91b6a9fe018909d1e77051de69..e186cf73c357dccff79c413b831c2c24e9fc2f13 100644 (file)
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFDataFormatter.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFDataFormatter.java
@@ -202,10 +202,12 @@ public class HSSFDataFormatter {
                // remove color formatting if present
                String formatStr = sFormat.replaceAll("\\[[a-zA-Z]*\\]", "");
                
-               // try to extract special characters like currency
-               Matcher m = specialPatternGroup.matcher(formatStr);             
+               // Try to extract special characters like currency
+               // Need to re-create the matcher each time, as the string
+               //  will potentially change on each pass
+               Matcher m;
                try {
-                       while(m.find()) {
+                       while((m = specialPatternGroup.matcher(formatStr)).find()) {
                                String match = m.group();
                                String symbol = match.substring(match.indexOf('$') + 1, match.indexOf('-'));
                                if (symbol.indexOf('$') > -1) {