Skip to content

fix: close IFile.getContents() streams in Toc/Contexts generators #1393

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

Merged
joaodinissf merged 1 commit into from
Jun 1, 2026
Merged

fix: close IFile.getContents() streams in Toc/Contexts generators #1393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 16 additions & 2 deletions ....tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/CheckContextsGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,16 @@
*******************************************************************************/
package com.avaloq.tools.ddk.check.ui.builder;

import java.io.IOException;
import java.io.InputStream;
import java.util.List;
import java.util.Set;

import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.emf.common.util.URI;
import org.eclipse.pde.internal.core.util.CoreUtility;
import org.eclipse.pde.internal.ua.core.ctxhelp.ICtxHelpConstants;
Expand All @@ -37,6 +40,7 @@
import com.avaloq.tools.ddk.check.generator.CheckGeneratorNaming;
import com.avaloq.tools.ddk.check.ui.builder.util.CheckContextsExtensionHelper;
import com.avaloq.tools.ddk.check.ui.builder.util.CheckProjectHelper;
import com.avaloq.tools.ddk.check.ui.internal.Activator;
import com.avaloq.tools.ddk.xtext.ui.util.RuntimeProjectUtil;
import com.google.common.collect.ComparisonChain;
import com.google.common.collect.Iterables;
Expand Down Expand Up @@ -74,7 +78,12 @@ public class CheckContextsGenerator {
public void updateContextsFile(final URI uri, final IBuildContext buildContext) throws CoreException {
IFile file = projectHelper.getHelpFile(uri, CheckContextsExtensionHelper.CONTEXTS_FILE_NAME);

CtxHelpModel model = new CtxHelpModel(CoreUtility.getTextDocument(file.getContents()), false);
final CtxHelpModel model;
try (InputStream contents = file.getContents()) {
model = new CtxHelpModel(CoreUtility.getTextDocument(contents), false);
} catch (IOException e) {
throw new CoreException(new Status(Status.ERROR, Activator.getPluginId(), e.getMessage(), e));
}
model.setUnderlyingResource(file);
model.load();

Expand Down Expand Up @@ -177,7 +186,12 @@ public void removeContexts(final Delta delta) throws CoreException {
if (project != null) {
IFile file = projectHelper.getHelpFile(project, CheckContextsExtensionHelper.CONTEXTS_FILE_NAME);

CtxHelpModel model = new CtxHelpModel(CoreUtility.getTextDocument(file.getContents()), false);
final CtxHelpModel model;
try (InputStream contents = file.getContents()) {
model = new CtxHelpModel(CoreUtility.getTextDocument(contents), false);
} catch (IOException e) {
throw new CoreException(new Status(Status.ERROR, Activator.getPluginId(), e.getMessage(), e));
}
model.setUnderlyingResource(file);
model.load();

Expand Down
18 changes: 16 additions & 2 deletions ...valoq.tools.ddk.check.ui/src/com/avaloq/tools/ddk/check/ui/builder/CheckTocGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,12 @@
*******************************************************************************/
package com.avaloq.tools.ddk.check.ui.builder;

import java.io.IOException;
import java.io.InputStream;

import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.Status;
import org.eclipse.emf.common.util.URI;
import org.eclipse.pde.internal.core.text.IDocumentElementNode;
import org.eclipse.pde.internal.core.util.CoreUtility;
Expand All @@ -26,6 +30,7 @@
import com.avaloq.tools.ddk.check.generator.CheckGeneratorNaming;
import com.avaloq.tools.ddk.check.ui.builder.util.CheckProjectHelper;
import com.avaloq.tools.ddk.check.ui.builder.util.CheckTocExtensionHelper;
import com.avaloq.tools.ddk.check.ui.internal.Activator;
import com.avaloq.tools.ddk.xtext.ui.util.RuntimeProjectUtil;
import com.google.inject.Inject;

Expand Down Expand Up @@ -222,9 +227,18 @@ private void updateToc(final TocModel model) throws CoreException {
*/
private TocModel loadTocModel(final URI uri) throws CoreException {
IFile file = projectHelper.getHelpFile(uri, CheckTocExtensionHelper.TOC_FILE_NAME);
TocModel model = new TocModel(CoreUtility.getTextDocument(file.getContents()), false);
final TocModel model;
try (InputStream contents = file.getContents()) {
model = new TocModel(CoreUtility.getTextDocument(contents), false);
} catch (IOException e) {
throw new CoreException(new Status(Status.ERROR, Activator.getPluginId(), e.getMessage(), e));
}
model.setUnderlyingResource(file);
model.load(file.getContents(), false);
try (InputStream contents = file.getContents()) {
model.load(contents, false);
} catch (IOException e) {
throw new CoreException(new Status(Status.ERROR, Activator.getPluginId(), e.getMessage(), e));
}
return model;
}

Expand Down