Merge remote-tracking branch 'origin/master' into 6.0.x

This commit is contained in:
William Cheng
2022-01-30 18:01:35 +08:00
4543 changed files with 127729 additions and 45908 deletions

View File

@@ -981,7 +981,12 @@ public class ApiClient extends JavaTimeFormatter {
}
}
Invocation.Builder invocationBuilder = target.request().accept(accept);
Invocation.Builder invocationBuilder;
if (accept != null) {
invocationBuilder = target.request().accept(accept);
} else {
invocationBuilder = target.request();
}
for (Entry<String, String> entry : cookieParams.entrySet()) {
String value = entry.getValue();

View File

@@ -50,6 +50,6 @@ public class RFC3339DateFormat extends DateFormat {
@Override
public Object clone() {
return this;
return super.clone();
}
}