[Swift-commit] r5145 - trunk/src/org/griphyn/vdl/karajan

[wozniak at ci.uchicago.edu]

Author: wozniak
Date: 2011-09-21 10:48:47 -0500 (Wed, 21 Sep 2011)
New Revision: 5145

Modified:
   trunk/src/org/griphyn/vdl/karajan/Loader.java
Log:
Fix to debugSitesText()


Modified: trunk/src/org/griphyn/vdl/karajan/Loader.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/Loader.java	2011-09-21 15:46:45 UTC (rev 5144)
+++ trunk/src/org/griphyn/vdl/karajan/Loader.java	2011-09-21 15:48:47 UTC (rev 5145)
@@ -344,7 +344,9 @@
 
     /**
        Enter the text content of given files into the log
-       @throws IOException
+       @param name A token printed in the log
+       @param file The text file to copy into the log
+       @throws IOException 
      */
     public static void debugText(String name, File file) {
     	Logger textLogger = Logger.getLogger("swift.textfiles");
@@ -361,15 +363,12 @@
 	}
 
     static void debugSitesText(VDL2Config config) {
-    	VDL2Config defaultConfig = null;
-    	try {
-			defaultConfig = VDL2Config.getDefaultConfig(); 
-			
-		} catch (IOException e) {
-			logger.warn("Could not log sites file text");			
-		}
+    	String defaultPoolFile = 
+        	System.getProperty("swift.home") + File.separator + 
+        	"etc" + File.separator + "sites.xml";
+
 		String poolFile = config.getPoolFile();
-		String defaultPoolFile = defaultConfig.getPoolFile();
+		System.out.println(defaultPoolFile);
 		if (poolFile.equals(defaultPoolFile)) {
 			Logger textLogger = Logger.getLogger("swift.textfiles");
 			textLogger.debug("using default sites file");