From 9c9990b9acb78aeddeefda0aeeeda9e1e231b420 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Wed, 22 Feb 2017 11:45:23 +0000 Subject: [PATCH] Initialise Logger in ReferenceMapper::read to avoid error message in AP --- .../asm/mixin/refmap/ReferenceMapper.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/refmap/ReferenceMapper.java b/src/main/java/org/spongepowered/asm/mixin/refmap/ReferenceMapper.java index e519a66b..2a368e72 100644 --- a/src/main/java/org/spongepowered/asm/mixin/refmap/ReferenceMapper.java +++ b/src/main/java/org/spongepowered/asm/mixin/refmap/ReferenceMapper.java @@ -65,11 +65,6 @@ public final class ReferenceMapper implements Serializable { * Passthrough mapper, used as failover */ public static final ReferenceMapper DEFAULT_MAPPER = new ReferenceMapper(true); - - /** - * Log even more things - */ - private static final Logger logger = LogManager.getLogger("mixin"); /** * "Default" mappings. The set of mappings to use as "default" is specified @@ -224,6 +219,7 @@ public final class ReferenceMapper implements Serializable { * @return new refmap or {@link #DEFAULT_MAPPER} if reading fails */ public static ReferenceMapper read(String resourcePath) { + Logger logger = LogManager.getLogger("mixin"); Reader reader = null; try { InputStream resource = Launch.classLoader.getResourceAsStream(resourcePath); @@ -232,9 +228,9 @@ public final class ReferenceMapper implements Serializable { return ReferenceMapper.readJson(reader); } } catch (JsonParseException ex) { - ReferenceMapper.logger.error("Invalid REFMAP JSON in " + resourcePath + ": " + ex.getClass().getName() + " " + ex.getMessage()); + logger.error("Invalid REFMAP JSON in " + resourcePath + ": " + ex.getClass().getName() + " " + ex.getMessage()); } catch (Exception ex) { - ReferenceMapper.logger.error("Failed reading REFMAP JSON from " + resourcePath + ": " + ex.getClass().getName() + " " + ex.getMessage()); + logger.error("Failed reading REFMAP JSON from " + resourcePath + ": " + ex.getClass().getName() + " " + ex.getMessage()); } finally { if (reader != null) { try {