Skip to content

Commit

Permalink
Fix [JENKINS-12168]
Browse files Browse the repository at this point in the history
  • Loading branch information
gboissinot committed Dec 29, 2011
1 parent bf50693 commit 24fae7a
Showing 1 changed file with 3 additions and 2 deletions.
Expand Up @@ -8,6 +8,7 @@
import hudson.remoting.VirtualChannel;
import hudson.util.SequentialExecutionQueue;
import hudson.util.StreamTaskListener;
import org.apache.tools.ant.*;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.resources.FileResource;
import org.jenkinsci.lib.xtrigger.XTriggerException;
Expand Down Expand Up @@ -202,7 +203,7 @@ private Map<String, FileInfo> getFileInfo(String path, String includes, String e

Map<String, FileInfo> result = new HashMap<String, FileInfo>();
if (includes == null) {
includes = "**/*.*";
includes = "**/*.*, **/*";
}
FileSet fileSet = Util.createFileSet(new File(path), includes, excludes);
for (Iterator it = fileSet.iterator(); it.hasNext();) {
Expand Down Expand Up @@ -371,7 +372,7 @@ public void run() {
Runner runner = new Runner(log, "FolderTrigger");
executorService.execute(runner);
} else {
log.info("Jenkins is quieting down or job is not buildable.");
log.info("Jenkins is quieting down or the job is not buildable.");
}
} catch (Exception e) {
LOGGER.log(Level.SEVERE, "Error during the trigger execution " + e.getMessage());
Expand Down

0 comments on commit 24fae7a

Please sign in to comment.