From 50fbec1bae300fe1389832b54d079277d08c4439 Mon Sep 17 00:00:00 2001 From: Julian Raufelder Date: Fri, 30 Apr 2021 11:51:32 +0200 Subject: [PATCH] Response can be null in afterError of LoggingAwareRequestHandler in S3 --- .../data/cloud/s3/S3ClientFactory.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/data/src/main/java/org/cryptomator/data/cloud/s3/S3ClientFactory.java b/data/src/main/java/org/cryptomator/data/cloud/s3/S3ClientFactory.java index 383254ab..ed0c1838 100644 --- a/data/src/main/java/org/cryptomator/data/cloud/s3/S3ClientFactory.java +++ b/data/src/main/java/org/cryptomator/data/cloud/s3/S3ClientFactory.java @@ -72,12 +72,16 @@ class S3ClientFactory { @Override public void afterError(Request request, Response response, Exception e) { - Timber.tag("S3Client").e( // - e, - "Error occurred (%s) with status %s (%s)", // - request.getAWSRequestMetrics().getTimingInfo().getStartTimeNano(), // - response.getHttpResponse().getStatusText(), // - response.getHttpResponse().getStatusCode()); + if (response != null) { + Timber.tag("S3Client").e( // + e, // + "Error occurred (%s) with status %s (%s)", // + request.getAWSRequestMetrics().getTimingInfo().getStartTimeNano(), // + response.getHttpResponse().getStatusText(), // + response.getHttpResponse().getStatusCode()); + } else { + Timber.tag("S3Client").e(e, "Error occurred (%s)", request.getAWSRequestMetrics().getTimingInfo().getStartTimeNano()); + } } } }