Skip to content

Fix handle leak in Windows for Java >= 10 #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
effad wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix handle leak in Windows for Java >= 10 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8e85b5
Fix handle leak in Windows for Java >= 10
Feb 18, 2020
e252757
Adaptions to release forked version.
Feb 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 46 additions & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.profesorfalken</groupId>
<groupId>net.synedra</groupId>
<artifactId>WMI4Java</artifactId>
<version>1.6.3</version>
<version>1.6.4</version>
<packaging>jar</packaging>


<name>WMI4Java</name>
<description>API to query WMI from Java</description>
<url>https://github.com/profesorfalken/WMI4Java</url>
<url>https://github.com/effad/WMI4Java</url>

<licenses>
<license>
Expand All @@ -26,10 +26,18 @@
<organization>ProfesorFalken</organization>
<organizationUrl>http://www.profesorfalken.com</organizationUrl>
</developer>
<developer>
<name>Robert Lichtenberger</name>
<email>r.lichtenberger@synedra.com</email>
<organization>synedra</organization>
<organizationUrl>http://www.synedra.com</organizationUrl>
</developer>

</developers>

<scm>
<url>https://github.com/profesorfalken/WMI4Java.git</url>
<developerConnection>scm:git:file:///home/rli/PWEs/WMI4Java</developerConnection>
<url>https://github.com/effad/WMI4Java.git</url>
</scm>

<distributionManagement>
Expand All @@ -56,10 +64,39 @@
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
<autoReleaseAfterClose>false</autoReleaseAfterClose>
</configuration>
</plugin>
<plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<source>8</source>
</configuration>
<version>2.9.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
Expand Down Expand Up @@ -123,8 +160,8 @@
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.5</maven.compiler.source>
<maven.compiler.target>1.5</maven.compiler.target>
<sonar.java.source>1.5</sonar.java.source>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<sonar.java.source>1.8</sonar.java.source>
</properties>
</project>
8 changes: 7 additions & 1 deletion src/main/java/com/profesorfalken/wmi4java/WMIVBScript.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ private static String executeScript(String scriptCode) throws WMIException {
File tmpFile = null;
FileWriter writer = null;
BufferedReader errorOutput = null;
Process process = null;

try {
tmpFile = File.createTempFile("wmi4java" + new Date().getTime(), ".vbs");
Expand All @@ -50,7 +51,7 @@ private static String executeScript(String scriptCode) throws WMIException {
writer.flush();
writer.close();

Process process = Runtime.getRuntime().exec(
process = Runtime.getRuntime().exec(
new String[]{"cmd.exe", "/C", "cscript.exe", "/NoLogo", tmpFile.getAbsolutePath()});
BufferedReader processOutput
= new BufferedReader(new InputStreamReader(process.getInputStream()));
Expand Down Expand Up @@ -89,6 +90,11 @@ private static String executeScript(String scriptCode) throws WMIException {
if (errorOutput != null) {
errorOutput.close();
}
if (process != null) {
process.getInputStream().close();
process.getOutputStream().close();
process.getErrorStream().close();
}
} catch (IOException ioe) {
Logger.getLogger(WMI4Java.class.getName()).log(Level.SEVERE, "Exception closing in finally", ioe);
}
Expand Down