Apache/httpcomponents-client
1
0
Fork 0
mirror of https://github.com/apache/httpcomponents-client.git synced 2025-02-09 03:25:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a logical error that can cause a NPE

Browse Source
This commit is contained in:
Oleg Kalnichevski 2023-06-18 17:11:22 +02:00
parent 6f1fd6d26b
commit 48253e8027
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsyncCachingExec.java vendored
View File

@ -673,8 +673,7 @@ private void handleCacheHit(
final boolean staleIfErrorEnabled = responseCachingPolicy.isStaleIfErrorEnabled(responseCacheControl, entry); final boolean staleIfErrorEnabled = responseCachingPolicy.isStaleIfErrorEnabled(responseCacheControl, entry);
if (cacheRevalidator != null if (cacheRevalidator != null
&& !staleResponseNotAllowed(requestCacheControl, responseCacheControl, entry, now) && !staleResponseNotAllowed(requestCacheControl, responseCacheControl, entry, now)
&& validityPolicy.mayReturnStaleWhileRevalidating(responseCacheControl, entry, now) && (validityPolicy.mayReturnStaleWhileRevalidating(responseCacheControl, entry, now) || staleIfErrorEnabled)) {
|| staleIfErrorEnabled) {
LOG.debug("Serving stale with asynchronous revalidation"); LOG.debug("Serving stale with asynchronous revalidation");
try { try {
final SimpleHttpResponse cacheResponse = generateCachedResponse(responseCacheControl, request, context, entry, now); final SimpleHttpResponse cacheResponse = generateCachedResponse(responseCacheControl, request, context, entry, now);

3
httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExec.java vendored
View File

@ -281,8 +281,7 @@ private ClassicHttpResponse handleCacheHit(
try { try {
if (cacheRevalidator != null if (cacheRevalidator != null
&& !staleResponseNotAllowed(requestCacheControl, responseCacheControl, entry, now) && !staleResponseNotAllowed(requestCacheControl, responseCacheControl, entry, now)
&& validityPolicy.mayReturnStaleWhileRevalidating(responseCacheControl, entry, now) && (validityPolicy.mayReturnStaleWhileRevalidating(responseCacheControl, entry, now) || staleIfErrorEnabled)) {
|| staleIfErrorEnabled) {
LOG.debug("Serving stale with asynchronous revalidation"); LOG.debug("Serving stale with asynchronous revalidation");
final String exchangeId = ExecSupport.getNextExchangeId(); final String exchangeId = ExecSupport.getNextExchangeId();
context.setExchangeId(exchangeId); context.setExchangeId(exchangeId);