Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lastAccessed is now an Instant

This commit is contained in:
Joakim Erdfelt 2022-09-06 15:09:44 -05:00
parent 226b9594f1
commit c122c99163
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/CachedContentFactory.java
View File

@ -294,10 +294,10 @@ public class CachedContentFactory implements HttpContent.ContentFactory
// Scan the entire cache and generate an ordered list by last accessed time.
SortedSet<CachedHttpContent> sorted = new TreeSet<>((c1, c2) ->
{
if (c1._lastAccessed < c2._lastAccessed)
if (c1._lastAccessed.isBefore(c2._lastAccessed))
return -1;
if (c1._lastAccessed > c2._lastAccessed)
if (c1._lastAccessed.isAfter(c2._lastAccessed))
return 1;
if (c1._contentLengthValue < c2._contentLengthValue)
@ -388,7 +388,7 @@ public class CachedContentFactory implements HttpContent.ContentFactory
private final AtomicReference<ByteBuffer> _indirectBuffer = new AtomicReference<>();
private final AtomicReference<ByteBuffer> _directBuffer = new AtomicReference<>();
private final AtomicReference<ByteBuffer> _mappedBuffer = new AtomicReference<>();
private volatile long _lastAccessed;
private volatile Instant _lastAccessed;
CachedHttpContent(String pathInContext, Resource resource, Map<CompressedContentFormat, CachedHttpContent> precompressedResources)
{
@ -411,7 +411,7 @@ public class CachedContentFactory implements HttpContent.ContentFactory
if (_cachedFiles.incrementAndGet() > _maxCachedFiles)
shrinkCache();
_lastAccessed = System.currentTimeMillis();
_lastAccessed = Instant.now();
_etag = CachedContentFactory.this._etags ? new PreEncodedHttpField(HttpHeader.ETAG, resource.getWeakETag()) : null;
@ -461,7 +461,7 @@ public class CachedContentFactory implements HttpContent.ContentFactory
{
if (_lastModifiedValue == _resource.lastModified() && _contentLengthValue == _resource.length())
{
_lastAccessed = System.currentTimeMillis();
_lastAccessed = Instant.now();
return true;
}

10
jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/CachedContentFactory.java
View File

@ -294,10 +294,10 @@ public class CachedContentFactory implements HttpContent.ContentFactory
// Scan the entire cache and generate an ordered list by last accessed time.
SortedSet<CachedHttpContent> sorted = new TreeSet<>((c1, c2) ->
{
if (c1._lastAccessed < c2._lastAccessed)
if (c1._lastAccessed.isBefore(c2._lastAccessed))
return -1;
if (c1._lastAccessed > c2._lastAccessed)
if (c1._lastAccessed.isAfter(c2._lastAccessed))
return 1;
if (c1._contentLengthValue < c2._contentLengthValue)
@ -386,7 +386,7 @@ public class CachedContentFactory implements HttpContent.ContentFactory
private final HttpField _etag;
private final Map<CompressedContentFormat, CachedPrecompressedHttpContent> _precompressed;
private final AtomicReference<ByteBuffer> _buffer = new AtomicReference<>();
private volatile long _lastAccessed;
private volatile Instant _lastAccessed;
CachedHttpContent(String pathInContext, Resource resource, Map<CompressedContentFormat, CachedHttpContent> precompressedResources)
{
@ -409,7 +409,7 @@ public class CachedContentFactory implements HttpContent.ContentFactory
if (_cachedFiles.incrementAndGet() > _maxCachedFiles)
shrinkCache();
_lastAccessed = System.currentTimeMillis();
_lastAccessed = Instant.now();
_etag = CachedContentFactory.this._etags ? new PreEncodedHttpField(HttpHeader.ETAG, resource.getWeakETag()) : null;
@ -459,7 +459,7 @@ public class CachedContentFactory implements HttpContent.ContentFactory
{
if (_lastModifiedValue == _resource.lastModified() && _contentLengthValue == _resource.length())
{
_lastAccessed = System.currentTimeMillis();
_lastAccessed = Instant.now();
return true;
}