Skip to content

Commit 941d7ed

Browse files
committed
get rid off Java 6 checks in code - as the min requirement is 7
1 parent 788bb8e commit 941d7ed

File tree

2 files changed

+1
-12
lines changed

2 files changed

+1
-12
lines changed

src/main/java/org/jruby/ext/openssl/OpenSSL.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -251,11 +251,6 @@ public static String javaVersion(final String def) {
251251
return javaVersionProperty;
252252
}
253253

254-
static boolean javaVersion6(final boolean atLeast) {
255-
final int gt = new Version("1.6").compareTo(new Version(javaVersion("0.0")));
256-
return atLeast ? gt <= 0 : gt == 0;
257-
}
258-
259254
static boolean javaVersion7(final boolean atLeast) {
260255
final int gt = new Version("1.7").compareTo(new Version(javaVersion("0.0")));
261256
return atLeast ? gt <= 0 : gt == 0;
@@ -272,7 +267,7 @@ static boolean javaVersion9(final boolean atLeast) {
272267
}
273268

274269
private static String javaName(final String def) {
275-
// Sun Java 6 or Oracle Java 7/8
270+
// Sun Java 6 or Oracle Java 7/8/9/10
276271
// "Java HotSpot(TM) Server VM" or "Java HotSpot(TM) 64-Bit Server VM"
277272
// OpenJDK :
278273
// "OpenJDK 64-Bit Server VM"

src/main/java/org/jruby/ext/openssl/Random.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,6 @@ private static Holder createHolderImpl() {
5656
if (HOLDER_TYPE.equals("default") || HOLDER_TYPE.equals("thread-local")) {
5757
return new ThreadLocalHolder();
5858
}
59-
if (HOLDER_TYPE.equals("")) {
60-
// NOTE: fine to remove when support for running on Java 6 is gone ...
61-
if (OpenSSL.javaVersion6(false)) {
62-
return new SharedHolder(); // can not-use ThreadLocalRandom.current()
63-
}
64-
}
6559
if (HOLDER_TYPE.equals("shared")) {
6660
return new SharedHolder();
6761
}

0 commit comments

Comments
 (0)