ATS-10 make sure slf4j logging works

appNG · Nov 22, 2018 · 5eb8518 · 5eb8518
1 parent cad0ce8
commit 5eb8518
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 10 deletions.
diff --git a/src/main/java/org/appng/tomcat/session/Utils.java b/src/main/java/org/appng/tomcat/session/Utils.java
@@ -19,6 +19,8 @@
 import java.io.InputStream;
 import java.io.ObjectInputStream;
 import java.lang.reflect.Constructor;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 import javax.servlet.ServletContext;
@@ -75,9 +77,7 @@ public static ObjectInputStream getObjectInputStream(ClassLoader classLoader, Se
 	public static ObjectInputStream getObjectInputStream(ClassLoader classLoader, ServletContext ctx,
 			InputStream data) {
 		ObjectInputStream ois = null;
-		ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
 		try {
-			Thread.currentThread().setContextClassLoader(classLoader);
 			@SuppressWarnings("unchecked")
 			Constructor<ObjectInputStream> constructor = (Constructor<ObjectInputStream>) classLoader
 					.loadClass(Constants.INPUT_STREAM_CLASS)
@@ -86,8 +86,6 @@ public static ObjectInputStream getObjectInputStream(ClassLoader classLoader, Se
 			ois = constructor.newInstance(data, ctx);
 		} catch (ReflectiveOperationException e) {
 			throw new IllegalArgumentException(e);
-		} finally {
-			Thread.currentThread().setContextClassLoader(contextClassLoader);
 		}
 		return ois;
 	}
@@ -99,10 +97,20 @@ private static Log getSlf4jWrapper(Class<?> clazz, Object slf4jLogger) {
 			private <T> T callRealMethod(String name, Object... args) {
 				try {
 					Class<?>[] types = new Class<?>[args.length];
-					for (int i = 0; i < types.length; i++) {
-						types[i] = args[i].getClass();
+					List<Object> argsList = Arrays.asList(args);
+					if (types.length > 0) {
+						types[0] = String.class;
+						if (null == args[0]) {
+							argsList.set(0, "");
+						} else if (!String.class.isAssignableFrom(args[0].getClass())) {
+							argsList.set(0, args[0].toString());
+						}
+						for (int i = 1; i < types.length; i++) {
+							types[i] = Throwable.class.isAssignableFrom(args[i].getClass()) ? Throwable.class
+									: Object.class;
+						}
 					}
-					return (T) slf4jLogger.getClass().getMethod(name, types).invoke(slf4jLogger, args);
+					return (T) slf4jLogger.getClass().getMethod(name, types).invoke(slf4jLogger, argsList.toArray());
 				} catch (Exception e) {
 					LogFactory.getLog(clazz).error("error while using slf4j", e);
 				}

diff --git a/src/test/java/org/appng/tomcat/session/UtilsTest.java b/src/test/java/org/appng/tomcat/session/UtilsTest.java
@@ -31,6 +31,8 @@
 
 public class UtilsTest {
 
+	Log log = Utils.getLog(UtilsTest.class);
+
 	@Test
 	public void test() throws Exception {
 		MockServletContext ctx = new MockServletContext();
@@ -59,10 +61,37 @@ public void test() throws Exception {
 		Assert.assertEquals("bar", ((Property) newSession.getAttribute("property")).getString());
 
 	}
+
+	@Test
+	public void testLogString() {
+		log.info("testLogString");
+	}
+
+	@Test
+	public void testLogObject() {
+		log.info(new Object());
+	}
+
+	@Test
+	public void testLogStringWithException() {
+		log.info("testLogStringWithException", new IllegalArgumentException("BOOOM!"));
+	}
+
+	@Test
+	public void testLogObjectWithException() {
+		log.info(new Object(), new IllegalArgumentException("BOOOM!"));
+	}
+
+	@Test
+	public void testLogNullWithException() {
+		log.info(null, new IllegalArgumentException("BOOOM!"));
+	}
 
 	@Test
-	public void testLog(){
-		Log log = Utils.getLog(UtilsTest.class);
-		log.info("testLog()");
+	public void testIsLevelEnabled(){
+		Assert.assertTrue(log.isInfoEnabled());
+		Assert.assertTrue(log.isWarnEnabled());
+		Assert.assertTrue(log.isErrorEnabled());
 	}
+
 }