Skip to content

core: fix floating-point number formatting Locale #7473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dapengzhang0 merged 4 commits into from
Oct 29, 2020
Merged

core: fix floating-point number formatting Locale #7473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
517b000
core: fix floating-point number formatting Locale
dapengzhang0 Sep 30, 2020
f67a63b
more occurrence
dapengzhang0 Sep 30, 2020
f283072
favor Locale.US
dapengzhang0 Oct 28, 2020
73e179c
more favor Locale.US
dapengzhang0 Oct 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion context/src/main/java/io/grpc/Deadline.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package io.grpc;

import java.util.Arrays;
import java.util.Locale;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
Expand Down Expand Up @@ -206,7 +207,7 @@ public String toString() {
}
buf.append(seconds);
if (nanos > 0) {
buf.append(String.format(".%09d", nanos));
buf.append(String.format(Locale.US, ".%09d", nanos));
}
buf.append("s from now");
if (ticker != SYSTEM_TICKER) {
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/java/io/grpc/internal/ClientCallImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
import io.perfmark.Tag;
import java.io.InputStream;
import java.nio.charset.Charset;
import java.util.Locale;
import java.util.concurrent.CancellationException;
import java.util.concurrent.Executor;
import java.util.concurrent.ScheduledExecutorService;
Expand Down Expand Up @@ -441,7 +442,7 @@ public void run() {
buf.append('-');
}
buf.append(seconds);
buf.append(String.format(".%09d", nanos));
buf.append(String.format(Locale.US, ".%09d", nanos));
buf.append("s. ");
buf.append(insight);
stream.cancel(DEADLINE_EXCEEDED.augmentDescription(buf.toString()));
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/java/io/grpc/internal/DelayedClientCall.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import io.grpc.Status;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.concurrent.Executor;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
Expand Down Expand Up @@ -117,7 +118,7 @@ private ScheduledFuture<?> scheduleDeadlineIfNeeded(
buf.append("Deadline exceeded after ");
}
buf.append(seconds);
buf.append(String.format(".%09d", nanos));
buf.append(String.format(Locale.US, ".%09d", nanos));
buf.append("s. ");
/** Cancels the call if deadline exceeded prior to the real call being set. */
class DeadlineExceededRunnable implements Runnable {
Expand Down