Skip to content

Commit d75bd79

Browse files
committed
Merge branch 'dev-1.2' into development
# Conflicts: # src/main/java/ch/ethz/seb/sps/server/weblayer/SEBSessionController.java
2 parents 31a3ade + 7ed9488 commit d75bd79

3 files changed

Lines changed: 365 additions & 359 deletions

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@
241241
<dependency>
242242
<groupId>io.minio</groupId>
243243
<artifactId>minio</artifactId>
244-
<version>8.5.11</version>
244+
<version>8.6.0</version>
245245
</dependency>
246246
</dependencies>
247247

src/main/java/ch/ethz/seb/sps/server/servicelayer/impl/ScreenshotStore_S3.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -155,12 +155,7 @@ public void storeScreenshot(
155155
IOUtils.toByteArray(in)));
156156

157157
} catch (final Exception e) {
158-
String message = e.getMessage();
159-
if (message != null && message.contains("Connection reset")) {
160-
log.warn("Failed to get screenshot from InputStream for session: {} err: {}", sessionUUID, e.getMessage());
161-
} else {
162-
log.error("Failed to get screenshot from InputStream for session: {}", sessionUUID, e);
163-
}
158+
log.warn("Failed to get screenshot from InputStream for session: {} err: {}", sessionUUID, e.getMessage());
164159
}
165160
}
166161

0 commit comments

Comments
 (0)