Author: mikedd
Date: Thu Jul 28 15:03:04 2011
New Revision: 1151885
URL: http://svn.apache.org/viewvc?rev=1151885&view=rev
Log:
OPENJPA-2036: Check JAVA_HOME for lib/tools.jar for all java vendors, not just
IBM.
Submitted By: Jason Pyeron
Modified:
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/InstrumentationFactory.java
Modified:
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/InstrumentationFactory.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/InstrumentationFactory.java?rev=1151885&r1=1151884&r2=1151885&view=diff
==============================================================================
---
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/InstrumentationFactory.java
(original)
+++
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/InstrumentationFactory.java
Thu Jul 28 15:03:04 2011
@@ -191,16 +191,14 @@ public class InstrumentationFactory {
if (log.isTraceEnabled() == true) {
log.trace(_name + ".findToolsJar() -- couldn't find default "
+ toolsJarFile.getAbsolutePath());
}
- if (JavaVendors.getCurrentVendor().isIBM()) {
- // If we're on an IBM SDK, then remove /jre off of java.home
and try again.
- if (javaHomeFile.getAbsolutePath().endsWith(File.separator +
"jre") == true) {
- javaHomeFile = javaHomeFile.getParentFile();
- toolsJarFile = new File(javaHomeFile, "lib" +
File.separator + "tools.jar");
- if (toolsJarFile.exists() == false) {
- if (log.isTraceEnabled() == true) {
- log.trace(_name + ".findToolsJar() -- for IBM SDK
couldn't find " +
- toolsJarFile.getAbsolutePath());
- }
+ // If we're on an IBM SDK, then remove /jre off of java.home and
try again.
+ if (javaHomeFile.getAbsolutePath().endsWith(File.separator +
"jre") == true) {
+ javaHomeFile = javaHomeFile.getParentFile();
+ toolsJarFile = new File(javaHomeFile, "lib" + File.separator +
"tools.jar");
+ if (toolsJarFile.exists() == false) {
+ if (log.isTraceEnabled() == true) {
+ log.trace(_name + ".findToolsJar() -- for IBM SDK
couldn't find " +
+ toolsJarFile.getAbsolutePath());
}
}
} else if
(System.getProperty("os.name").toLowerCase().indexOf("mac") >= 0) {
