- * Hudson doesn't work with a clustering anyway, and so it's better to just not persist
+ * Jenkins doesn't work with a clustering anyway, and so it's better to just not persist
* Authentication at all.
*
* See http://www.nabble.com/ActiveDirectory-Plugin%3A-ClassNotFoundException-while-loading--persisted-sessions%3A-td22085140.html
@@ -45,8 +45,8 @@ public class NotSerilizableSecurityContext implements SecurityContext {
@Override
public boolean equals(Object obj) {
- if (obj instanceof SecurityContextImpl) {
- SecurityContextImpl test = (SecurityContextImpl) obj;
+ if (obj instanceof SecurityContext) {
+ SecurityContext test = (SecurityContext) obj;
if ((this.getAuthentication() == null) && (test.getAuthentication() == null)) {
return true;
diff --git a/core/src/main/java/hudson/slaves/SlaveComputer.java b/core/src/main/java/hudson/slaves/SlaveComputer.java
index efb26660bb73ce6217f935ef4754e341742ce160..f808256798732f10ebe614a33ea76d23f4112c87 100644
--- a/core/src/main/java/hudson/slaves/SlaveComputer.java
+++ b/core/src/main/java/hudson/slaves/SlaveComputer.java
@@ -575,12 +575,11 @@ public class SlaveComputer extends Computer {
// avoid double installation of the handler. JNLP slaves can reconnect to the master multiple times
// and each connection gets a different RemoteClassLoader, so we need to evict them by class name,
// not by their identity.
- Logger logger = Logger.getLogger("hudson");
- for (Handler h : logger.getHandlers()) {
+ for (Handler h : LOGGER.getHandlers()) {
if (h.getClass().getName().equals(SLAVE_LOG_HANDLER.getClass().getName()))
- logger.removeHandler(h);
+ LOGGER.removeHandler(h);
}
- logger.addHandler(SLAVE_LOG_HANDLER);
+ LOGGER.addHandler(SLAVE_LOG_HANDLER);
// remove Sun PKCS11 provider if present. See http://wiki.jenkins-ci.org/display/JENKINS/Solaris+Issue+6276483
try {
@@ -594,6 +593,7 @@ public class SlaveComputer extends Computer {
return null;
}
private static final long serialVersionUID = 1L;
+ private static final Logger LOGGER = Logger.getLogger("hudson");
}
/**
diff --git a/core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java b/core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java
index fe86c1ad7d4e3479405a6b6a097db5d887918d99..294cd953131dd2825dc82a0e765ada23346fce7a 100644
--- a/core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java
+++ b/core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java
@@ -68,8 +68,7 @@ import java.util.List;
*
* @author Kohsuke Kawaguchi
*/
-public class JUnitResultArchiver extends Recorder implements Serializable,
- MatrixAggregatable {
+public class JUnitResultArchiver extends Recorder implements MatrixAggregatable {
/**
* {@link FileSet} "includes" string, like "foo/bar/*.xml"
diff --git a/core/src/main/java/hudson/tools/ToolInstallation.java b/core/src/main/java/hudson/tools/ToolInstallation.java
index 50849a3351e56f848ff6ca061e4dff18f72a8b59..ef4aea75d778a58fc5e48e44daaf815da3cc50d1 100644
--- a/core/src/main/java/hudson/tools/ToolInstallation.java
+++ b/core/src/main/java/hudson/tools/ToolInstallation.java
@@ -153,7 +153,7 @@ public abstract class ToolInstallation extends AbstractDescribableImpl