Changeset 10580 in josm for trunk/src/org/openstreetmap/josm/io/remotecontrol

Timestamp:

2016-07-21T01:57:41+02:00 (8 years ago)

Author:

Don-vip

Message:

see #11390 - switch to Java 8

File:

• trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java

@@ -46 +46 @@
 import sun.security.x509.CertificateAlgorithmId;
 import sun.security.x509.CertificateExtensions;
-import sun.security.x509.CertificateIssuerName;
 import sun.security.x509.CertificateSerialNumber;
-import sun.security.x509.CertificateSubjectName;
 import sun.security.x509.CertificateValidity;
 import sun.security.x509.CertificateVersion;
@@ -149 +147 @@
         info.set(X509CertInfo.VALIDITY, interval);
         info.set(X509CertInfo.SERIAL_NUMBER, new CertificateSerialNumber(sn));
-
-        // Change of behaviour in JDK8:
-        // https://bugs.openjdk.java.net/browse/JDK-8040820
-        // https://bugs.openjdk.java.net/browse/JDK-7198416
-        if (!Main.isJava8orLater()) {
-            // Java 7 code. To remove with Java 8 migration
-            info.set(X509CertInfo.SUBJECT, new CertificateSubjectName(owner));
-            info.set(X509CertInfo.ISSUER, new CertificateIssuerName(owner));
-        } else {
-            // Java 8 and later code
-            info.set(X509CertInfo.SUBJECT, owner);
-            info.set(X509CertInfo.ISSUER, owner);
-        }
+        info.set(X509CertInfo.SUBJECT, owner);
+        info.set(X509CertInfo.ISSUER, owner);
 
         info.set(X509CertInfo.KEY, new CertificateX509Key(pair.getPublic()));