fix test broken during LocationInfo refactoring

Author: ceki

src/main/java/org/apache/log4j/spi/LocationInfo.java

@@ -48,6 +48,7 @@ public class LocationInfo implements java.io.Serializable {
      * All available caller information, in the format
      * <code>fully.qualified.classname.of.caller.methodName(Filename.java:line)</code>
      */
+    // ATTENTION: fullInfo is used to reconstruct the other fields post deserialization
     public String fullInfo;
 
     /**
@@ -178,12 +179,33 @@ public LocationInfo(final String file, final String classname, final String meth
 	this.fullInfo = buf.toString();
     }
 
+    
     /**
      * Return the fully qualified class name of the caller making the logging
      * request.
      */
     public String getClassName() {
-	return className;
+	if (fullInfo == null)
+	    return NA;
+	if (className != null) {
+	    return className;
+	} else {
+	    // Starting the search from '(' is safer because there is
+	    // potentially a dot between the parentheses.
+	    int iend = fullInfo.lastIndexOf('(');
+	    if (iend == -1)
+		className = NA;
+	    else {
+		iend = fullInfo.lastIndexOf('.', iend);
+		int ibegin = 0;
+
+		if (iend == -1)
+		    className = NA;
+		else
+		    className = this.fullInfo.substring(ibegin, iend);
+	    }
+	    return className;
+	}
     }
 
     /**
@@ -193,6 +215,18 @@ public String getClassName() {
      * This information is not always available.
      */
     public String getFileName() {
+	if (fullInfo == null)
+	    return NA;
+	if (fileName == null) {
+	    int iend = fullInfo.lastIndexOf(':');
+	    if (iend == -1)
+		fileName = NA;
+	    else {
+		int ibegin = fullInfo.lastIndexOf('(', iend - 1);
+		fileName = this.fullInfo.substring(ibegin + 1, iend);
+	    }
+	}
+
 	return fileName;
     }
 
@@ -203,13 +237,33 @@ public String getFileName() {
      * This information is not always available.
      */
     public String getLineNumber() {
+	if (fullInfo == null)
+	    return NA;
+	if (lineNumber == null) {
+	    int iend = fullInfo.lastIndexOf(')');
+	    int ibegin = fullInfo.lastIndexOf(':', iend - 1);
+	    if (ibegin == -1)
+		lineNumber = NA;
+	    else
+		lineNumber = this.fullInfo.substring(ibegin + 1, iend);
+	}
 	return lineNumber;
     }
 
     /**
      * Returns the method name of the caller.
      */
     public String getMethodName() {
+	if (fullInfo == null)
+	    return NA;
+	if (methodName == null) {
+	    int iend = fullInfo.lastIndexOf('(');
+	    int ibegin = fullInfo.lastIndexOf('.', iend);
+	    if (ibegin == -1)
+		methodName = NA;
+	    else
+		methodName = this.fullInfo.substring(ibegin + 1, iend);
+	}
 	return methodName;
     }
 }

src/test/java/org/apache/log4j/net/ShortSocketServer.java

@@ -29,7 +29,7 @@
 
 /**
  * This SocketServer exits after certain number of connections from a client.
- * This number is determined the totalsTest parameter, that is the first
+ * This number is determined the totalTests parameter, that is the first
  * argument on the commmand line. The second argument, prefix, determines the
  * prefix of the configuration file to use. Each run of the server will use a
  * different properties file. For the i-th run, the path to the file is

src/test/java/org/apache/log4j/net/SocketServerTestCase.java

@@ -381,14 +381,15 @@ public static Test suite() {
 	String fileSeparator = System.getProperty("file.separator");
 	String pathToJavaExecutable = javaHome + fileSeparator + "bin" + fileSeparator + "java";
 	System.out.println("java executable assumed to be located at [" + pathToJavaExecutable + "]");
+	// run ShortSocketServer
 	ProcessBuilder processBuilder = new ProcessBuilder(pathToJavaExecutable, "-cp", claspath,
 		shortSocketServerClassName, "8", TEST_INPUT_PREFIX + "socketServer");
 	processBuilder.redirectErrorStream(true);
 	processBuilder.inheritIO();
 	System.out.println(shortSocketServerClassName);
 	try {
 	    Process process = processBuilder.start();
-	    Thread.sleep(2000);
+	    Thread.sleep(1000);
 	    // List<String> results = readLines(process.getInputStream());
 	    // System.out.println(results);