Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[github-358] improve locking in CellDateFormatter. Thanks to XenoAmess. This closes #358 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1902754 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2022-07-15 21:31:35 +00:00
parent 917f8d027a
commit 70bd85fda4
1 changed files with 74 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
poi/src/main/java/org/apache/poi/ss/format/CellDateFormatter.java
View File

@ -40,11 +40,11 @@ public class CellDateFormatter extends CellFormatter {
private String sFmt; private String sFmt;
private static final Calendar EXCEL_EPOCH_CAL = private static final Calendar EXCEL_EPOCH_CAL =
LocaleUtil.getLocaleCalendar(1904, 0, 1); LocaleUtil.getLocaleCalendar(1904, 0, 1);
private static final int NUM_MILLISECONDS_IN_DAY = 1000 * 60 * 60 * 24; private static final int NUM_MILLISECONDS_IN_DAY = 1000 * 60 * 60 * 24;
private static /* final */ CellDateFormatter SIMPLE_DATE; private static /* final */ volatile CellDateFormatter SIMPLE_DATE;
class DatePartHandler implements CellFormatPart.PartHandler { class DatePartHandler implements CellFormatPart.PartHandler {
private int mStart = -1; private int mStart = -1;
@ -54,79 +54,79 @@ public class CellDateFormatter extends CellFormatter {
@Override @Override
public String handlePart(Matcher m, String part, CellFormatType type, public String handlePart(Matcher m, String part, CellFormatType type,
StringBuffer desc) { StringBuffer desc) {
int pos = desc.length(); int pos = desc.length();
char firstCh = part.charAt(0); char firstCh = part.charAt(0);
switch (firstCh) { switch (firstCh) {
case 's': case 's':
case 'S': case 'S':
if (mStart >= 0) { if (mStart >= 0) {
for (int i = 0; i < mLen; i++) for (int i = 0; i < mLen; i++)
desc.setCharAt(mStart + i, 'm'); desc.setCharAt(mStart + i, 'm');
mStart = -1; mStart = -1;
} }
return part.toLowerCase(Locale.ROOT);
case 'h':
case 'H':
mStart = -1;
hStart = pos;
hLen = part.length();
return part.toLowerCase(Locale.ROOT);
case 'd':
case 'D':
mStart = -1;
if (part.length() <= 2)
return part.toLowerCase(Locale.ROOT); return part.toLowerCase(Locale.ROOT);
else
return part.toLowerCase(Locale.ROOT).replace('d', 'E');
case 'm': case 'h':
case 'M': case 'H':
mStart = pos;
mLen = part.length();
// For 'm' after 'h', output minutes ('m') not month ('M')
if (hStart >= 0)
return part.toLowerCase(Locale.ROOT);
else
return part.toUpperCase(Locale.ROOT);
case 'y':
case 'Y':
mStart = -1;
// See https://issues.apache.org/bugzilla/show_bug.cgi?id=53369
if (part.length() == 1)
part = "yy";
else if (part.length() == 3)
part = "yyyy";
return part.toLowerCase(Locale.ROOT);
case '0':
mStart = -1;
int sLen = part.length();
sFmt = "%0" + (sLen + 2) + "." + sLen + "f";
return part.replace('0', 'S');
case 'a':
case 'A':
case 'p':
case 'P':
if (part.length() > 1) {
// am/pm marker
mStart = -1; mStart = -1;
showAmPm = true; hStart = pos;
showM = StringUtil.toLowerCase(part.charAt(1)).equals("m"); hLen = part.length();
// For some reason "am/pm" becomes AM or PM, but "a/p" becomes a or p return part.toLowerCase(Locale.ROOT);
amPmUpper = showM || StringUtil.isUpperCase(part.charAt(0));
return "a"; case 'd':
} case 'D':
//noinspection fallthrough mStart = -1;
if (part.length() <= 2)
return part.toLowerCase(Locale.ROOT);
else
return part.toLowerCase(Locale.ROOT).replace('d', 'E');
default: case 'm':
return null; case 'M':
mStart = pos;
mLen = part.length();
// For 'm' after 'h', output minutes ('m') not month ('M')
if (hStart >= 0)
return part.toLowerCase(Locale.ROOT);
else
return part.toUpperCase(Locale.ROOT);
case 'y':
case 'Y':
mStart = -1;
// See https://issues.apache.org/bugzilla/show_bug.cgi?id=53369
if (part.length() == 1)
part = "yy";
else if (part.length() == 3)
part = "yyyy";
return part.toLowerCase(Locale.ROOT);
case '0':
mStart = -1;
int sLen = part.length();
sFmt = "%0" + (sLen + 2) + "." + sLen + "f";
return part.replace('0', 'S');
case 'a':
case 'A':
case 'p':
case 'P':
if (part.length() > 1) {
// am/pm marker
mStart = -1;
showAmPm = true;
showM = StringUtil.toLowerCase(part.charAt(1)).equals("m");
// For some reason "am/pm" becomes AM or PM, but "a/p" becomes a or p
amPmUpper = showM || StringUtil.isUpperCase(part.charAt(0));
return "a";
}
//noinspection fallthrough
default:
return null;
} }
} }
@ -242,11 +242,15 @@ public class CellDateFormatter extends CellFormatter {
*/ */
@Override @Override
public void simpleValue(StringBuffer toAppendTo, Object value) { public void simpleValue(StringBuffer toAppendTo, Object value) {
synchronized (CellDateFormatter.class) { CellDateFormatter cellDateFormatter = SIMPLE_DATE;
if (SIMPLE_DATE == null || !SIMPLE_DATE.EXCEL_EPOCH_CAL.equals(EXCEL_EPOCH_CAL)) { if (cellDateFormatter == null) {
SIMPLE_DATE = new CellDateFormatter("mm/d/y"); synchronized (CellDateFormatter.class) {
cellDateFormatter = SIMPLE_DATE;
if (cellDateFormatter == null) {
SIMPLE_DATE = cellDateFormatter = new CellDateFormatter("mm/d/y");
}
} }
} }
SIMPLE_DATE.formatValue(toAppendTo, value); cellDateFormatter.formatValue(toAppendTo, value);
} }
} }