Skip to content

Commit

Permalink
Merge pull request #688 from 1ab23c/feature/IZPACK-1578
Browse files Browse the repository at this point in the history
fix bug IZPACK-1578
  • Loading branch information
rkrell committed Oct 16, 2019
2 parents 4328dee + 6f83f88 commit fe29fb2
Showing 1 changed file with 5 additions and 5 deletions.
Expand Up @@ -66,23 +66,23 @@ public JDKPathConsolePanel(VariableSubstitutor variableSubstitutor, RegistryDefa

public boolean run(InstallData installData, Properties properties)
{
String strTargetPath = properties.getProperty(InstallData.INSTALL_PATH);
if (strTargetPath == null || "".equals(strTargetPath.trim()))
String strJDKPath = properties.getProperty(JDKPathPanelHelper.JDK_PATH);
if (strJDKPath == null || "".equals(strJDKPath.trim()))
{
System.err.println("Missing mandatory target path!");
System.err.println("Missing mandatory JDK path!");
return false;
}
else
{
try
{
strTargetPath = variableSubstitutor.substitute(strTargetPath);
strJDKPath = variableSubstitutor.substitute(strJDKPath);
}
catch (Exception e)
{
// ignore
}
installData.setInstallPath(strTargetPath);
installData.setVariable(JDKPathPanelHelper.JDK_PATH, strJDKPath);
return true;
}
}
Expand Down

0 comments on commit fe29fb2

Please sign in to comment.