Author: sebb
Date: Fri Nov 22 22:08:14 2013
New Revision: 1544695
URL: http://svn.apache.org/r1544695
Log:
Remove unnecessary method
Modified:
jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java
jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java
Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java?rev=1544695&r1=1544694&r2=1544695&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java Fri Nov 22 22:08:14
2013
@@ -85,7 +85,7 @@ public class KeyToolUtils {
} else {
keytoolPath = "keytool"; // $NON-NLS-1$
if (!checkKeytool(keytoolPath)) { // Not found on PATH, check Java Home
- File javaHome = JOrphanUtils.getJavaHome();
+ File javaHome = SystemUtils.getJavaHome();
if (javaHome != null) {
keytoolPath = new File(new File(javaHome,"bin"),"keytool").getPath(); // $NON-NLS-1$
$NON-NLS-2$
if (!checkKeytool(keytoolPath)) {
Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java?rev=1544695&r1=1544694&r2=1544695&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java Fri Nov 22 22:08:14
2013
@@ -569,14 +569,4 @@ public final class JOrphanUtils {
offset += chunk;
}
}
-
- /**
- * Find where the running instance of Java is installed (if possible).
- * May not work with all versions of Java.
- *
- * @return the home location of Java, or {@code null} if the method fails
- */
- public static File getJavaHome() {
- return SystemUtils.getJavaHome();
- }
}
\ No newline at end of file
|