JAL-3322 corrected fix to convertBuildingMD task fail. removed debugging warnings...

[jalview.git] / getdown / src / getdown / core / src / main / java / com / threerings / getdown / data / Application.java

diff --git a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
index 0ba2a5e..5c61378 100644 (file)
--- a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
+++ b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
@@ -282,16 +282,17 @@ public class Application
      *
      */
     public Application (EnvConfig envc) {
-        _envc = envc;
-        _config = getLocalPath(envc.appDir, CONFIG_FILE);
-        _backupConfig = getLocalPath(new File(envc.appDir.getAbsolutePath()+File.separator+BACKUP_CONFIG_DIR), CONFIG_FILE);
+       _envc = envc;
+       _config = getLocalPath(envc.appDir, CONFIG_FILE);
+       _backupConfig = getLocalPath(envc.appDir, BACKUP_CONFIG_DIR+File.separator+CONFIG_FILE);
+       log.warning("Backup config file now", "_backupConfig", _backupConfig, "exists", _backupConfig.exists(), "isReadable", _backupConfig.canRead());
     }
 
     /**
      * Returns the configured application directory.
      */
     public File getAppDir () {
-        return _envc.appDir;
+       return _envc.appDir;
     }
 
     /**
@@ -300,7 +301,7 @@ public class Application
      */
     public boolean useCodeCache ()
     {
-        return _useCodeCache;
+       return _useCodeCache;
     }
 
     /**
@@ -309,7 +310,7 @@ public class Application
      */
     public int getCodeCacheRetentionDays ()
     {
-        return _codeCacheRetentionDays;
+       return _codeCacheRetentionDays;
     }
 
     /**
@@ -317,7 +318,7 @@ public class Application
      * app files from its hosting server.
      */
     public int maxConcurrentDownloads () {
-        return _maxConcDownloads;
+       return _maxConcDownloads;
     }
 
     /**
@@ -326,21 +327,11 @@ public class Application
     public Resource getConfigResource ()
     {
        Resource res = null;
-        try {
-            res = createResource(CONFIG_FILE, Resource.NORMAL);
-        } catch (Exception e) {
-            log.warning("Invalid appbase '" + _vappbase + "'.", e);
-        }
-        if (res == null) {
-               try {
-                               String backupConfig = BACKUP_CONFIG_DIR + File.separator + CONFIG_FILE;
-                       log.warning("Could not read config '"+CONFIG_FILE+"'. Attempting to use backup '"+backupConfig+"'");
-                               res = createResource(backupConfig, Resource.NORMAL);
-               } catch (Exception ex) {
-                               throw new RuntimeException("Invalid appbase in backup config'" + _vappbase + "'.", ex);
-               }
-        }
-        return res;
+       try {
+               return createResource(CONFIG_FILE, Resource.NORMAL);
+       } catch (Exception e) {
+               log.warning("Invalid appbase '" + _vappbase + "'.", e);
+       }
     }
 
     /**
@@ -348,7 +339,7 @@ public class Application
      */
     public List<Resource> getCodeResources ()
     {
-        return _codes;
+       return _codes;
     }
 
     /**
@@ -617,7 +608,8 @@ public class Application
         }
         if (config == null || config.getString("appbase") == null || config.getString("appbase").isEmpty()) {
                try {
-                       config = Config.parseConfig(_backupConfig, opts);
+                       Config backupConfig = Config.parseConfig(_backupConfig, opts);
+                       config = backupConfig;
                        log.warning("Using backup config file", "appdir", getAppDir(), "backupConfig", _backupConfig.getAbsoluteFile());
                } catch (Exception e) {
                        log.warning("Failure reading backup config file", "file", _backupConfig, e);