Merge branch 'hf-1.0.2' into main

igloo-project · Mar 13, 2023 · 57ac9e8 · 57ac9e8
2 parents 542be0d + b1cec81
commit 57ac9e8
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/jul-helper-api/pom.xml b/jul-helper-api/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.iglooproject.components</groupId>
 		<artifactId>igloo-logging</artifactId>
-		<version>1.0.1</version>
+		<version>1.0.2</version>
 	</parent>
 
 	<artifactId>jul-helper-api</artifactId>

diff --git a/jul-helper/pom.xml b/jul-helper/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.iglooproject.components</groupId>
 		<artifactId>igloo-logging</artifactId>
-		<version>1.0.1</version>
+		<version>1.0.2</version>
 	</parent>
 
 	<artifactId>jul-helper</artifactId>

diff --git a/log4j2-jmx-helper/pom.xml b/log4j2-jmx-helper/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.iglooproject.components</groupId>
 		<artifactId>igloo-logging</artifactId>
-		<version>1.0.1</version>
+		<version>1.0.2</version>
 	</parent>
 
 	<artifactId>log4j2-jmx-helper</artifactId>

diff --git a/log4j2-jmx-helper/src/main/java/igloo/log4j2jmx/servlet/Log4j2LoggingManagerListener.java b/log4j2-jmx-helper/src/main/java/igloo/log4j2jmx/servlet/Log4j2LoggingManagerListener.java
@@ -43,14 +43,16 @@ public class Log4j2LoggingManagerListener implements ServletContextListener {
 
 	@Override
 	public void contextInitialized(ServletContextEvent sce) {
-		Log4j2LoggingManagerMBean.registerMBean();
+		mbeanObjectName = Log4j2LoggingManagerMBean.registerMBean();
 
 		LOGGER.info("jul-to-slf4j installed");
 	}
 
 	@Override
 	public void contextDestroyed(ServletContextEvent sce) {
-		Log4j2LoggingManagerMBean.unregisterMBean(mbeanObjectName);
+		if (mbeanObjectName != null) {
+			Log4j2LoggingManagerMBean.unregisterMBean(mbeanObjectName);
+		}
 	}
 
 }
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 
 	<groupId>org.iglooproject.components</groupId>
 	<artifactId>igloo-logging</artifactId>
-	<version>1.0.1</version>
+	<version>1.0.2</version>
 	<packaging>pom</packaging>
 
 	<properties>