Skip to content

Reliable channel: close resources in finally block. #572

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
grlima merged 2 commits into from
Feb 23, 2018
Merged

Reliable channel: close resources in finally block. #572

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af16b53
Reliable channel: close resources in finally block.
grlima Feb 23, 2018
0dc73f1
change logging to warning when closing resources
grlima Feb 23, 2018
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
31 changes: 20 additions & 11 deletions ...java/com/microsoft/applicationinsights/internal/channel/common/PartialSuccessHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,27 +114,36 @@ List<String> generateOriginalItems(TransmissionHandlerArgs args) {

if (args.getTransmission().getWebContentEncodingType() == "gzip") {

GZIPInputStream gis = null;
BufferedReader bufferedReader = null;

try {
GZIPInputStream gis = new GZIPInputStream(
gis = new GZIPInputStream(
new ByteArrayInputStream(args.getTransmission().getContent()));
BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(gis));
bufferedReader = new BufferedReader(new InputStreamReader(gis));
String line;
while ((line = bufferedReader.readLine()) != null) {
originalItems.add(line);
}
} catch (IOException ex) {
InternalLogger.INSTANCE.error("IOException: Error while reading the GZIP stream.%nStack Trace:%n%s", ExceptionUtils.getStackTrace(ex));
} catch (Throwable t) {
InternalLogger.INSTANCE.error("Error while reading the GZIP stream.%nStack Trace:%n%s", ExceptionUtils.getStackTrace(t));
} finally {
if (gis != null) {
Copy link
Contributor

@littleaj littleaj Feb 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you want, you can inline gis and remove this block. InputStreamReader and BufferedReader both close thier respective reader/stream in each of their close methods.

Copy link
Contributor

@dhaval24 dhaval24 Feb 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@littleaj yes I would like to see this change. Thanks for pointing out. It's not blocking but these are good performance constructs!

Copy link
Contributor Author

@grlima grlima Feb 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@littleaj - thanks, will follow up with you in person

gis.close();
try {
gis.close();
} catch (IOException ex){
InternalLogger.INSTANCE.warn("Error while closing the GZIP stream.%nStack Trace:%n%s", ExceptionUtils.getStackTrace(ex));
}
}
if (bufferedReader != null) {
bufferedReader.close();
try {
bufferedReader.close();
} catch (IOException ex){
InternalLogger.INSTANCE.warn("Error while closing the buffered reader.%nStack Trace:%n%s", ExceptionUtils.getStackTrace(ex));
}
}
} catch (IOException e1) {
InternalLogger.INSTANCE.error("IOException: Error while reading the GZIP stream.%nStack Trace:%n%s",
ExceptionUtils.getStackTrace(e1));
} catch (Throwable t) {
InternalLogger.INSTANCE.error("Error while reading the GZIP stream.%nStack Trace:%n%s",
ExceptionUtils.getStackTrace(t));
} finally {
}
} else {
for (String s : new String(args.getTransmission().getContent()).split("\r\n")) {
Expand Down