diff options
| author | Manuel Bentele | 2021-12-15 14:47:13 +0100 |
|---|---|---|
| committer | Manuel Bentele | 2021-12-15 14:47:13 +0100 |
| commit | 0d7adb07774074867d1784c27a93d030dacf286d (patch) | |
| tree | 0d594f033b8c5d43182bea1367c67d568ca83e40 /src/main/java/org/openslx/imagemaster/localrpc | |
| parent | pom: Add "modern" way to set target Java version (diff) | |
| download | masterserver-0d7adb07774074867d1784c27a93d030dacf286d.tar.gz masterserver-0d7adb07774074867d1784c27a93d030dacf286d.tar.xz masterserver-0d7adb07774074867d1784c27a93d030dacf286d.zip | |
Update log4j because of the CVE-2021-44228 security flaw
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/localrpc')
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/localrpc/JsonUser.java | 5 | ||||
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/localrpc/NetworkHandler.java | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/org/openslx/imagemaster/localrpc/JsonUser.java b/src/main/java/org/openslx/imagemaster/localrpc/JsonUser.java index 6b2769b..9c86ea7 100644 --- a/src/main/java/org/openslx/imagemaster/localrpc/JsonUser.java +++ b/src/main/java/org/openslx/imagemaster/localrpc/JsonUser.java @@ -1,6 +1,7 @@ package org.openslx.imagemaster.localrpc; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.bwlp.thrift.iface.Role; import org.openslx.bwlp.thrift.iface.UserInfo; import org.openslx.imagemaster.util.Util; @@ -8,7 +9,7 @@ import org.openslx.imagemaster.util.Util; public class JsonUser { - private static final Logger LOGGER = Logger.getLogger( JsonUser.class ); + private static final Logger LOGGER = LogManager.getLogger( JsonUser.class ); private String userId = null; private String organizationId = null; diff --git a/src/main/java/org/openslx/imagemaster/localrpc/NetworkHandler.java b/src/main/java/org/openslx/imagemaster/localrpc/NetworkHandler.java index 5caeab3..228d793 100644 --- a/src/main/java/org/openslx/imagemaster/localrpc/NetworkHandler.java +++ b/src/main/java/org/openslx/imagemaster/localrpc/NetworkHandler.java @@ -10,7 +10,8 @@ import java.nio.charset.StandardCharsets; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.bwlp.thrift.iface.ClientSessionData; import org.openslx.bwlp.thrift.iface.UserInfo; import org.openslx.imagemaster.session.Session; @@ -25,7 +26,7 @@ import com.google.gson.Gson; public class NetworkHandler implements Runnable { - private static final Logger log = Logger.getLogger( NetworkHandler.class ); + private static final Logger log = LogManager.getLogger( NetworkHandler.class ); private Thread sendThread = null; /** |