Merge pull request #342 from ccronemberger/master

fix issue 268

Author: chrisisbeef

src/main/java/org/owasp/esapi/reference/Log4JLogger.java

@@ -447,7 +447,9 @@ private void log(Level level, EventType type, String message, Throwable throwabl
 		}
 
 		// log the message
-		log(level, "[" + typeInfo + getUserInfo() + " -> " + appInfo + "] " + clean, throwable);
+		// Fix for https://code.google.com/p/owasp-esapi-java/issues/detail?id=268
+		// need to pass callerFQCN so the log is not generated as if it were always generated from this wrapper class
+		log(Log4JLogger.class.getName(), level, "[" + typeInfo + getUserInfo() + " -> " + appInfo + "] " + clean, throwable);
 	}
 
 	/**

src/test/java/org/owasp/esapi/reference/Log4JLoggerTest.java

@@ -15,20 +15,24 @@
  */
 package org.owasp.esapi.reference;
 
-import java.io.IOException;
-import java.util.Arrays;
-
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
-
+import org.apache.log4j.Appender;
+import org.apache.log4j.Layout;
+import org.apache.log4j.WriterAppender;
+import org.apache.log4j.spi.LoggingEvent;
 import org.owasp.esapi.ESAPI;
 import org.owasp.esapi.Logger;
 import org.owasp.esapi.errors.AuthenticationException;
 import org.owasp.esapi.errors.ValidationException;
 import org.owasp.esapi.http.MockHttpServletRequest;
 import org.owasp.esapi.http.MockHttpServletResponse;
 
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.Arrays;
+
 /**
  * The Class LoggerTest.
  * 
@@ -460,4 +464,37 @@ public void testAlways() {
         }
 	}
 
+	/**
+	 * Validation for issue: https://code.google.com/p/owasp-esapi-java/issues/detail?id=268
+	 * Line number must be the line of the caller and not of the wrapper.
+	 */
+	public void testLine() {
+		final String message = "testing only";
+		StringWriter sw = new StringWriter();
+		Layout layout = new Layout() {
+			@Override
+			public String format(LoggingEvent event) {
+				assertEquals("the calling class is this test class", Log4JLoggerTest.class.getName(),event.getLocationInformation().getClassName());
+				return message;
+			}
+
+			@Override
+			public boolean ignoresThrowable() {
+				return false;
+			}
+
+			@Override
+			public void activateOptions() {
+
+			}
+		};
+		Appender appender = new WriterAppender(layout, sw);
+		log4JLogger.addAppender(appender);
+		try {
+			log4JLogger.fatal("testLine");
+			assertEquals("message not generated as expected", message, sw.toString());
+		} finally {
+			log4JLogger.removeAppender(appender);
+		}
+	}
 }