From 0d7adb07774074867d1784c27a93d030dacf286d Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Wed, 15 Dec 2021 14:47:13 +0100
Subject: Update log4j because of the CVE-2021-44228 security flaw

---
 .../org/openslx/imagemaster/serverconnection/ConnectionHandler.java  | 5 +++--
 .../org/openslx/imagemaster/serverconnection/IncomingTransfer.java   | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/main/java/org/openslx/imagemaster/serverconnection')

diff --git a/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java b/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java
index f32c655..8b6d197 100644
--- a/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java
+++ b/src/main/java/org/openslx/imagemaster/serverconnection/ConnectionHandler.java
@@ -19,7 +19,8 @@ import javax.net.ssl.KeyManager;
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.bwlp.thrift.iface.ImagePublishData;
 import org.openslx.bwlp.thrift.iface.InvocationError;
 import org.openslx.bwlp.thrift.iface.TInvocationException;
@@ -43,7 +44,7 @@ import org.openslx.util.QuickTimer.Task;
 public class ConnectionHandler implements IncomingEvent
 {
 
-	private static final Logger LOGGER = Logger.getLogger( ConnectionHandler.class );
+	private static final Logger LOGGER = LogManager.getLogger( ConnectionHandler.class );
 
 	private static final int MAX_TRANSFERS = 12;
 
diff --git a/src/main/java/org/openslx/imagemaster/serverconnection/IncomingTransfer.java b/src/main/java/org/openslx/imagemaster/serverconnection/IncomingTransfer.java
index 004178d..7b499be 100644
--- a/src/main/java/org/openslx/imagemaster/serverconnection/IncomingTransfer.java
+++ b/src/main/java/org/openslx/imagemaster/serverconnection/IncomingTransfer.java
@@ -7,7 +7,8 @@ import java.sql.SQLException;
 import java.util.List;
 import java.util.UUID;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.bwlp.thrift.iface.ImagePublishData;
 import org.openslx.bwlp.thrift.iface.TInvocationException;
 import org.openslx.bwlp.thrift.iface.TransferInformation;
@@ -23,7 +24,7 @@ import org.openslx.util.ThriftUtil;
 public class IncomingTransfer extends IncomingTransferBase
 {
 
-	private static final Logger LOGGER = Logger.getLogger( IncomingTransfer.class );
+	private static final Logger LOGGER = LogManager.getLogger( IncomingTransfer.class );
 
 	private static final long MIN_FREE_SPACE_BYTES = FileChunk.CHUNK_SIZE * 10;
 
-- 
cgit v1.2.3-55-g7522