garydgregory commented on code in PR #567:
URL:
https://github.com/apache/httpcomponents-client/pull/567#discussion_r1720769799
##########
httpclient5/src/main/java/org/apache/hc/client5/http/entity/LazyDecompressingInputStream.java:
##########
@@ -83,19 +83,29 @@ public boolean markSupported() {
@Override
public int available() throws IOException {
- initWrapper();
- return wrapperStream.available();
+ return initWrapper().available();
}
@Override
public void close() throws IOException {
try {
- if (wrapperStream != null) {
- wrapperStream.close();
- }
+ Closer.close(wrapperStream);
} finally {
- wrappedStream.close();
+ super.close();
+ }
+ }
+
+ @Override
+ public synchronized void mark(final int readlimit) {
Review Comment:
Thank you both for the reviews.
The simplest change and implementation that keeps in line with what to have
today is to remove the `synchronized` keyword and let the delegate's
implementation do what it will. If we wanted mark/reset to be thread-safe, we
could make the whole class thread-safe like this:
```java
private final ReentrantLock lock = new ReentrantLock();
...
/**
* Thread-safe initialization of the wrapped stream.
*
* @return the wrapper stream.
* @throws IOException if an IO error occurs.
*/
private InputStream initWrapper() throws IOException {
if (wrapperStream == null) {
lock.lock();
try {
wrapperStream = wrapperStream != null ? wrapperStream :
inputStreamFactory.create(in);
} finally {
lock.unlock();
}
}
return wrapperStream;
}
```
but then each call to the stream would lock-unlock.
So, either:
- Don't use `synchronized` and that's it.
- Only have mark/reset use lock-unlock, or
- Implement using the above thread-safe `initWrapper()`?
For now, the PR takes the simplest route.
WDYT?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
