From 2acd856c4cf1bcf8cc60a2852d0a548e49ec91b0 Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Wed, 15 Dec 2021 14:36:57 +0100
Subject: Update log4j because of the CVE-2021-44228 security flaw

---
 src/main/java/org/openslx/thrifthelper/ThriftHandler.java | 5 +++--
 src/main/java/org/openslx/thrifthelper/ThriftManager.java | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/main/java/org/openslx/thrifthelper')

diff --git a/src/main/java/org/openslx/thrifthelper/ThriftHandler.java b/src/main/java/org/openslx/thrifthelper/ThriftHandler.java
index 05563d0..28b0fa6 100644
--- a/src/main/java/org/openslx/thrifthelper/ThriftHandler.java
+++ b/src/main/java/org/openslx/thrifthelper/ThriftHandler.java
@@ -9,7 +9,8 @@ import java.util.Deque;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.thrift.TException;
 import org.apache.thrift.TServiceClient;
 import org.apache.thrift.transport.TTransportException;
@@ -18,7 +19,7 @@ import org.openslx.thrifthelper.ThriftManager.ErrorCallback;
 class ThriftHandler<T extends TServiceClient> implements InvocationHandler
 {
 
-	private final static Logger LOGGER = Logger.getLogger( ThriftHandler.class );
+	private final static Logger LOGGER = LogManager.getLogger( ThriftHandler.class );
 
 	protected interface WantClientCallback<T>
 	{
diff --git a/src/main/java/org/openslx/thrifthelper/ThriftManager.java b/src/main/java/org/openslx/thrifthelper/ThriftManager.java
index 099caaa..8bb5dd7 100644
--- a/src/main/java/org/openslx/thrifthelper/ThriftManager.java
+++ b/src/main/java/org/openslx/thrifthelper/ThriftManager.java
@@ -8,7 +8,8 @@ import java.net.Socket;
 import javax.net.SocketFactory;
 import javax.net.ssl.SSLContext;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.thrift.TServiceClient;
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.protocol.TProtocol;
@@ -23,7 +24,7 @@ import org.openslx.util.Util;
 public class ThriftManager<T>
 {
 
-	private final static Logger LOGGER = Logger.getLogger( ThriftManager.class );
+	private final static Logger LOGGER = LogManager.getLogger( ThriftManager.class );
 
 	public interface ErrorCallback
 	{
-- 
cgit v1.2.3-55-g7522