o JENKINS-10994: finish env var expansion

git-svn-id: https://svn.jenkins-ci.org/trunk/hudson/plugins/thinBackup@40136 71c3de6d-444a-0410-be80-ed276b4c234a
jenkinsci · Nov 22, 2011 · 86d899f · 86d899f
1 parent 51a24a1
commit 86d899f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/main/java/org/jvnet/hudson/plugins/thinbackup/ThinBackupPluginImpl.java b/src/main/java/org/jvnet/hudson/plugins/thinbackup/ThinBackupPluginImpl.java
@@ -112,7 +112,7 @@ public String getExpandedBackupPath() {
     try {
       expandedPath = Utils.expandEnvironmentVariables(backupPath);
     } catch (final EnvironmentVariableNotDefinedException evnde) {
-      LOGGER.log(Level.SEVERE, "Error while expanding path. Using unexpanded path.", evnde);
+      LOGGER.log(Level.SEVERE, evnde.getMessage() + " Using unexpanded path.");
       expandedPath = backupPath;
     }
 

diff --git a/src/main/java/org/jvnet/hudson/plugins/thinbackup/utils/Utils.java b/src/main/java/org/jvnet/hudson/plugins/thinbackup/utils/Utils.java
@@ -397,7 +397,6 @@ protected static String internalExpandEnvironmentVariables(final String path,
                 .format(
                     "Environment variable '%s' was specified in path '%s', but it is not defined in the system's environment variables.",
                     envVar, path);
-            LOGGER.warning(message);
             throw new EnvironmentVariableNotDefinedException(message);
           }
           newPath.append(tmpPath.substring(0, startIdx));