Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #2862 from fbelzunc/JENKINS-43936
[FIXED JENKINS-43936] Only migrate legacy users once per restart
  • Loading branch information
oleg-nenashev committed Apr 29, 2017
2 parents 6ff5086 + f091c9d commit 8a48e0c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion core/src/main/java/hudson/model/User.java
Expand Up @@ -432,7 +432,7 @@ public synchronized void doSubmitDescription( StaplerRequest req, StaplerRespons
byNameLock.readLock().unlock();
}
final File configFile = getConfigFileFor(id);
if (!configFile.isFile() && !configFile.getParentFile().isDirectory()) {
if (u == null && !configFile.isFile() && !configFile.getParentFile().isDirectory()) {
// check for legacy users and migrate if safe to do so.
File[] legacy = getLegacyConfigFilesFor(id);
if (legacy != null && legacy.length > 0) {
Expand Down

0 comments on commit 8a48e0c

Please sign in to comment.