Attaching a patch that removes these unnecessary checks from conditions in BaseMonitor, EmbedXAResource and CorruptDiskStorageFactory.

All the regression tests passed with the patch.

Do you happen to know what now happens if you try to run 10.8 with a pre-jdk14 jvm. It would be nice if you got some reasonable error or warning vs. some wierd error now that the old code path is gone. Doing this in one place at boot is probably reasonable cost vs the multiple checks that you are going after.

Since we compile every class in Derby with target level 1.4 or higher, none of the classes will even load on a pre-jdk14 jvm. This is what I see with Java 1.3 and Derby 10.8.2.2:

java.lang.UnsupportedClassVersionError: org/apache/derby/tools/sysinfo (Unsupported major.minor version 48.0)
at java.lang.ClassLoader.defineClass0(Native Method)
at java.lang.ClassLoader.defineClass(ClassLoader.java:488)
at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:106)
at java.net.URLClassLoader.defineClass(URLClassLoader.java:243)
at java.net.URLClassLoader.access$100(URLClassLoader.java:51)
at java.net.URLClassLoader$1.run(URLClassLoader.java:190)
at java.security.AccessController.doPrivileged(Native Method)
at java.net.URLClassLoader.findClass(URLClassLoader.java:183)
at java.lang.ClassLoader.loadClass(ClassLoader.java:294)
at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:288)
at java.lang.ClassLoader.loadClass(ClassLoader.java:250)
at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:310)

Even though most of the engine classes must still be compiled with target level 1.4 for CDC/FP support, we'll probably want to change the target level to 1.5 for the JDBC 3.0 specific classes (like EmbeddedDriver and EmbeddedDataSource), so that a similar error will be seen when trying to load Derby 10.9 on Java 1.4.

Committed revision 1220671.