diff -r 01b9c26e2651 -r 82a71d82e326 src/java.base/share/classes/sun/net/www/protocol/ftp/Handler.java
--- a/src/java.base/share/classes/sun/net/www/protocol/ftp/Handler.java	Tue Aug 27 22:26:42 2019 +0200
+++ b/src/java.base/share/classes/sun/net/www/protocol/ftp/Handler.java	Tue Aug 27 14:44:21 2019 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
  * questions.
  */
 
-/*-
+/*
  *      FTP stream opener
  */
 
@@ -34,6 +34,7 @@
 import java.net.Proxy;
 import java.util.Map;
 import java.util.HashMap;
+import java.util.Objects;
 import sun.net.ftp.FtpClient;
 import sun.net.www.protocol.http.HttpURLConnection;
 
@@ -47,8 +48,7 @@
     protected boolean equals(URL u1, URL u2) {
         String userInfo1 = u1.getUserInfo();
         String userInfo2 = u2.getUserInfo();
-        return super.equals(u1, u2) &&
-            (userInfo1 == null? userInfo2 == null: userInfo1.equals(userInfo2));
+        return super.equals(u1, u2) && Objects.equals(userInfo1, userInfo2);
     }
 
     protected java.net.URLConnection openConnection(URL u)