Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[JENKINS-50598] - File type check causes issues in jenkins/pct Docker…
… image when a WAR is passed from volume
  • Loading branch information
oleg-nenashev committed Apr 6, 2018
1 parent e158a39 commit 0ab49c3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/main/java/org/jvnet/hudson/test/WarExploder.java
Expand Up @@ -93,13 +93,13 @@ private static File explode() throws Exception {
final File war;
if (JENKINS_WAR_PATH != null) {
war = new File(JENKINS_WAR_PATH).getAbsoluteFile();
LOGGER.log(Level.INFO, "Using a predefined WAR file {0} define by the -{1} system property",
LOGGER.log(Level.INFO, "Using a predefined WAR file {0} define by the {1} system property",
new Object[] {war, JENKINS_WAR_PATH_PROPERTY_NAME});
if (!war.exists()) {
throw new IOException("A Predefined WAR file path does not exist: " + war);
} else if (!war.isFile()) {
} /* Causes issues in jenkins/pct run when WAR comes from the volume - else if (!war.isFile()) {
throw new IOException("A Predefined WAR file path does not point to a file: " + war);
}
}*/
} else {
// locate jenkins.war
URL winstone = WarExploder.class.getResource("/winstone.jar");
Expand Down

0 comments on commit 0ab49c3

Please sign in to comment.