Skip to content

Commit

Permalink
Remove obsolete JRockit instantiator (close #40)
Browse files Browse the repository at this point in the history
  • Loading branch information
henri-tremblay committed May 18, 2016
1 parent 30ba05b commit 44e2239
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 85 deletions.
2 changes: 1 addition & 1 deletion SupportedJVMs.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* OpenJDK 6, 7, 8, 9
* Android API level 8 to 23 (Serialization support starting from Honeycomb)
* Azul Zulu (tested on 1.8.0_45-b14)
* BEA JRockit versions 7.0 (1.3.1), 1.4.2 and 1.5
* BEA JRockit R27, R28
* GCJ version 3.4.4 (tested on Windows/Cygwin)
* Aonix PERC (no serialization support), tested on version 5.0.0667

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import org.objenesis.instantiator.basic.AccessibleInstantiator;
import org.objenesis.instantiator.basic.ObjectInputStreamInstantiator;
import org.objenesis.instantiator.gcj.GCJInstantiator;
import org.objenesis.instantiator.jrockit.JRockitLegacyInstantiator;
import org.objenesis.instantiator.perc.PercInstantiator;
import org.objenesis.instantiator.sun.SunReflectionFactoryInstantiator;
import org.objenesis.instantiator.sun.UnsafeFactoryInstantiator;
Expand Down Expand Up @@ -84,19 +83,7 @@ else if(PlatformDescription.isThisJVM(DALVIK)) {
return new Android18Instantiator<T>(type);
}
else if(PlatformDescription.isThisJVM(JROCKIT)) {
if(VM_VERSION.startsWith("1.4")) {
// JRockit vendor version will be RXX where XX is the version
// Versions prior to 26 need special handling
// From R26 on, java.vm.version starts with R
if(!VENDOR_VERSION.startsWith("R")) {
// On R25.1 and R25.2, ReflectionFactory should work. Otherwise, we must use the
// Legacy instantiator.
if(VM_INFO == null || !VM_INFO.startsWith("R25.1") || !VM_INFO.startsWith("R25.2")) {
return new JRockitLegacyInstantiator<T>(type);
}
}
}
// After that, JRockit became compliant with HotSpot
// JRockit is compliant with HotSpot
return new SunReflectionFactoryInstantiator<T>(type);
}
else if(PlatformDescription.isThisJVM(GNU)) {
Expand Down

0 comments on commit 44e2239

Please sign in to comment.