diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java index e97ac65e0d..7f62a9e244 100644 --- a/core/src/main/java/hudson/ClassicPluginStrategy.java +++ b/core/src/main/java/hudson/ClassicPluginStrategy.java @@ -414,7 +414,7 @@ public class ClassicPluginStrategy implements PluginStrategy { public void updateDependency(PluginWrapper depender, PluginWrapper dependee) { DependencyClassLoader classLoader = findAncestorDependencyClassLoader(depender.classLoader); if (classLoader != null) { - classLoader.updateTransientDependencies(); + classLoader.updateTransitiveDependencies(); LOGGER.log(Level.INFO, "Updated dependency of {0}", depender.getShortName()); } } @@ -580,9 +580,9 @@ public class ClassicPluginStrategy implements PluginStrategy { private final PluginManager pluginManager; /** - * Topologically sorted list of transient dependencies. Lazily initialized via double-checked locking. + * Topologically sorted list of transitive dependencies. Lazily initialized via double-checked locking. */ - private volatile List transientDependencies; + private volatile List transitiveDependencies; static { registerAsParallelCapable(); @@ -595,17 +595,17 @@ public class ClassicPluginStrategy implements PluginStrategy { this.pluginManager = pluginManager; } - private void updateTransientDependencies() { + private void updateTransitiveDependencies() { // This will be recalculated at the next time. - transientDependencies = null; + transitiveDependencies = null; } private List getTransitiveDependencies() { - List localTransientDependencies = transientDependencies; - if (localTransientDependencies == null) { + List localTransitiveDependencies = transitiveDependencies; + if (localTransitiveDependencies == null) { synchronized (this) { - localTransientDependencies = transientDependencies; - if (localTransientDependencies == null) { + localTransitiveDependencies = transitiveDependencies; + if (localTransitiveDependencies == null) { CyclicGraphDetector cgd = new CyclicGraphDetector() { @Override protected List getEdges(PluginWrapper pw) { @@ -629,11 +629,11 @@ public class ClassicPluginStrategy implements PluginStrategy { throw new AssertionError(e); // such error should have been reported earlier } - transientDependencies = localTransientDependencies = cgd.getSorted(); + transitiveDependencies = localTransitiveDependencies = cgd.getSorted(); } } } - return localTransientDependencies; + return localTransitiveDependencies; } @Override