Permalink
Browse files

Merge pull request #3317 from daniel-beck/JENKINS-32599

[JENKINS-32599] Ignore misplaced users/config.xml file
  • Loading branch information...
oleg-nenashev committed Mar 7, 2018
2 parents 7add30c + 35a38f0 commit 02eebecfab96fa9f9ef9844c7ebebad5fdb71c27
Showing with 3 additions and 0 deletions.
  1. +3 −0 core/src/main/java/hudson/model/User.java
@@ -1092,6 +1092,9 @@ public static void scanAll() {
File[] subdirs = getRootDir().listFiles((FileFilter) DirectoryFileFilter.INSTANCE);
if (subdirs != null) {
for (File subdir : subdirs) {
if (subdir.equals(getRootDir())) {
continue; // ignore the parent directory in case of stray config.xml
}
File configFile = new File(subdir, "config.xml");
if (configFile.exists()) {
String name = strategy.idFromFilename(subdir.getName());

0 comments on commit 02eebec

Please sign in to comment.