[hibernate-commits] Hibernate SVN: r19771 - core/branches/gradle2/buildSrc/src/main/java/org/hibernate/gradle/util.

[hibernate-commits at lists.jboss.org]

Author: steve.ebersole at jboss.com
Date: 2010-06-18 20:14:57 -0400 (Fri, 18 Jun 2010)
New Revision: 19771

Modified:
   core/branches/gradle2/buildSrc/src/main/java/org/hibernate/gradle/util/Jdk.java
Log:
helpers to handle mixed jdk versions

Modified: core/branches/gradle2/buildSrc/src/main/java/org/hibernate/gradle/util/Jdk.java
===================================================================
--- core/branches/gradle2/buildSrc/src/main/java/org/hibernate/gradle/util/Jdk.java	2010-06-19 00:03:29 UTC (rev 19770)
+++ core/branches/gradle2/buildSrc/src/main/java/org/hibernate/gradle/util/Jdk.java	2010-06-19 00:14:57 UTC (rev 19771)
@@ -3,15 +3,10 @@
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.LineNumberReader;
 
 import org.apache.tools.ant.taskdefs.condition.Os;
 import org.apache.tools.ant.util.FileUtils;
-import org.gradle.process.internal.DefaultExecHandle;
-import org.gradle.process.internal.ExecHandle;
-import org.gradle.process.internal.ExecHandleBuilder;
 
 /**
  * Models path information for a particular JDK install.
@@ -54,6 +49,10 @@
         return new File( getJdkExecutable( "javadoc" ) );
     }
 
+	public JavaVersion getVersion() {
+		return version;
+	}
+
 	protected String getJdkExecutable(String command) {
 		File executable = findInDir( jdkHome + "/bin", command );
 
@@ -102,12 +101,7 @@
 		String version = null;
 		final String key = "java version \"";
 		try {
-			File javaCommand = getJavaExecutable();
-			ExecHandleBuilder execHandleBuilder = new ExecHandleBuilder();
-			execHandleBuilder.commandLine( javaCommand.getAbsolutePath(), "-version" );
-			ExecHandle execHandle = execHandleBuilder.build();
-			execHandle.start();
-//			Process javaProcess = Runtime.getRuntime().exec( new String[] { javaCommand.getAbsolutePath(), "-version" } );
+			final File javaCommand = getJavaExecutable();
 			Process javaProcess = Runtime.getRuntime().exec( javaCommand.getAbsolutePath() + " -version" );
 
 			try {
@@ -118,6 +112,7 @@
 						version = line.substring( key.length(), line.length() - 1 );
 					}
 				}
+				br.close();
 
 				br = new BufferedReader( new InputStreamReader( javaProcess.getInputStream() ) );
 				while ( (line = br.readLine()) != null) {
@@ -125,6 +120,7 @@
 						version = line.substring( key.length(), line.length() - 1 );
 					}
 				}
+				br.close();
 			}
 			finally {
 				javaProcess.destroy();