You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by pe...@apache.org on 2012/11/20 13:01:17 UTC

svn commit: r1411633 - in /river/jtsk/trunk/qa/src/com/sun/jini/qa/harness: AdminManager.java QAConfig.java

Author: peter_firmstone
Date: Tue Nov 20 12:01:16 2012
New Revision: 1411633

URL: http://svn.apache.org/viewvc?rev=1411633&view=rev
Log:
More logging messages to assist with debugging, revert QAConfig getLocalHostName method

Modified:
    river/jtsk/trunk/qa/src/com/sun/jini/qa/harness/AdminManager.java
    river/jtsk/trunk/qa/src/com/sun/jini/qa/harness/QAConfig.java

Modified: river/jtsk/trunk/qa/src/com/sun/jini/qa/harness/AdminManager.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/qa/harness/AdminManager.java?rev=1411633&r1=1411632&r2=1411633&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/qa/harness/AdminManager.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/qa/harness/AdminManager.java Tue Nov 20 12:01:16 2012
@@ -361,6 +361,7 @@ public class AdminManager {
      */
     private Admin getServiceSuppliedAdmin(String serviceName, int counter) throws TestException {
 	String adminName = config.getStringConfigVal(serviceName + ".adminName", null);
+        logger.log(Level.FINEST, "adminName: {0}", adminName);
 	String mode = 
 	    config.getStringConfigVal("com.sun.jini.qa.harness.serviceMode", 
 				      null);
@@ -641,7 +642,7 @@ public class AdminManager {
     public Object startService(String serviceName, String host) 
 	throws RemoteException, TestException
     {
-	logger.log(Level.FINE, "starting " + serviceName);
+	logger.log(Level.FINE, "starting {0}", serviceName);
 	Admin admin = getAdmin(serviceName, host); // never returns null
 	admin.start();
         return admin.getProxy();

Modified: river/jtsk/trunk/qa/src/com/sun/jini/qa/harness/QAConfig.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/qa/src/com/sun/jini/qa/harness/QAConfig.java?rev=1411633&r1=1411632&r2=1411633&view=diff
==============================================================================
--- river/jtsk/trunk/qa/src/com/sun/jini/qa/harness/QAConfig.java (original)
+++ river/jtsk/trunk/qa/src/com/sun/jini/qa/harness/QAConfig.java Tue Nov 20 12:01:16 2012
@@ -2152,7 +2152,7 @@ public class QAConfig implements Seriali
     public String getLocalHostName() {
 	String host = "localhost";
 	try {
-	    host = InetAddress.getLocalHost().getCanonicalHostName();
+	    host = InetAddress.getLocalHost().getHostName();
 	} catch (UnknownHostException ignore) {
 	}
 	return host;