diff --git a/changelog.html b/changelog.html
index 724583a1d4..7b606a1d5c 100644
--- a/changelog.html
+++ b/changelog.html
@@ -55,6 +55,9 @@ Upcoming changes
+ -
+ Fixed "java.lang.NoClassDefFoundError: JarURLConnection" on OpenJDK
+ (issue 20163)
-
Allow background tasks to run simultaneously, preventing task blockage.
(issue 19622)
diff --git a/core/pom.xml b/core/pom.xml
index 0ac4919e05..20f457b4d0 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -42,7 +42,7 @@ THE SOFTWARE.
true
- 1.222
+ 1.223
2.5.6.SEC03
1.8.9
diff --git a/core/src/main/java/jenkins/AgentProtocol.java b/core/src/main/java/jenkins/AgentProtocol.java
index f6524c6695..df702ac88f 100644
--- a/core/src/main/java/jenkins/AgentProtocol.java
+++ b/core/src/main/java/jenkins/AgentProtocol.java
@@ -27,6 +27,10 @@ public abstract class AgentProtocol implements ExtensionPoint {
* Protocol name.
*
* This is a short string that consists of printable ASCII chars. Sent by the client to select the protocol.
+ *
+ * @return
+ * null to be disabled. This is useful for avoiding getting used
+ * until the protocol is properly configured.
*/
public abstract String getName();
@@ -44,7 +48,8 @@ public abstract class AgentProtocol implements ExtensionPoint {
public static AgentProtocol of(String protocolName) {
for (AgentProtocol p : all()) {
- if (p.getName().equals(protocolName))
+ String n = p.getName();
+ if (n!=null && n.equals(protocolName))
return p;
}
return null;