Skip to content

Fixed file lock leaks in GLSLLoader. #738

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
shadowislord merged 1 commit into from
Sep 21, 2017
Merged

Fixed file lock leaks in GLSLLoader. #738

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
46 changes: 20 additions & 26 deletions jme3-core/src/plugins/java/com/jme3/shader/plugins/GLSLLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,9 @@
*/
package com.jme3.shader.plugins;

import com.jme3.asset.AssetInfo;
import com.jme3.asset.AssetKey;
import com.jme3.asset.AssetLoadException;
import com.jme3.asset.AssetLoader;
import com.jme3.asset.AssetManager;
import com.jme3.asset.*;
import com.jme3.asset.cache.AssetCache;

import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
Expand All @@ -49,7 +46,7 @@
public class GLSLLoader implements AssetLoader {

private AssetManager assetManager;
private Map<String, ShaderDependencyNode> dependCache = new HashMap<String, ShaderDependencyNode>();
private Map<String, ShaderDependencyNode> dependCache = new HashMap<>();

/**
* Used to load {@link ShaderDependencyNode}s.
Expand All @@ -70,25 +67,27 @@ public Class<? extends AssetCache> getCacheType() {

/**
* Creates a {@link ShaderDependencyNode} from a stream representing shader code.
*
* @param in The input stream containing shader code
* @param nodeName
* @return
* @throws IOException
*
* @param reader the reader with shader code
* @param nodeName the node name.
* @return the shader dependency node
* @throws AssetLoadException if we failed to load the shader code.
*/
private ShaderDependencyNode loadNode(Reader reader, String nodeName) {
ShaderDependencyNode node = new ShaderDependencyNode(nodeName);

ShaderDependencyNode node = new ShaderDependencyNode(nodeName);
StringBuilder sb = new StringBuilder();
StringBuilder sbExt = new StringBuilder();
BufferedReader bufReader = null;
try {
bufReader = new BufferedReader(reader);

try (final BufferedReader bufferedReader = new BufferedReader(reader)) {

String ln;

if (!nodeName.equals("[main]")) {
sb.append("// -- begin import ").append(nodeName).append(" --\n");
}
while ((ln = bufReader.readLine()) != null) {

while ((ln = bufferedReader.readLine()) != null) {
if (ln.trim().startsWith("#import ")) {
ln = ln.trim().substring(8).trim();
if (ln.startsWith("\"") && ln.endsWith("\"") && ln.length() > 3) {
Expand Down Expand Up @@ -118,13 +117,7 @@ private ShaderDependencyNode loadNode(Reader reader, String nodeName) {
if (!nodeName.equals("[main]")) {
sb.append("// -- end import ").append(nodeName).append(" --\n");
}
} catch (IOException ex) {
if (bufReader != null) {
try {
bufReader.close();
} catch (IOException ex1) {
}
}
} catch (final IOException ex) {
throw new AssetLoadException("Failed to load shader node: " + nodeName, ex);
}

Expand All @@ -137,7 +130,7 @@ private ShaderDependencyNode loadNode(Reader reader, String nodeName) {
private ShaderDependencyNode nextIndependentNode() throws IOException {
Collection<ShaderDependencyNode> allNodes = dependCache.values();

if (allNodes == null || allNodes.isEmpty()) {
if (allNodes.isEmpty()) {
return null;
}

Expand Down Expand Up @@ -168,7 +161,7 @@ private String resolveDependencies(ShaderDependencyNode node, Set<ShaderDependen
return node.getSource();
} else {
StringBuilder sb = new StringBuilder(node.getSource());
List<String> resolvedShaderNodes = new ArrayList<String>();
List<String> resolvedShaderNodes = new ArrayList<>();

for (ShaderDependencyNode dependencyNode : node.getDependencies()) {
resolvedShaderNodes.add(resolveDependencies(dependencyNode, alreadyInjectedSet, extensions));
Expand All @@ -182,8 +175,9 @@ private String resolveDependencies(ShaderDependencyNode node, Set<ShaderDependen
}
}

@Override
public Object load(AssetInfo info) throws IOException {
// The input stream provided is for the vertex shader,
// The input stream provided is for the vertex shader,
// to retrieve the fragment shader, use the content manager
this.assetManager = info.getManager();
Reader reader = new InputStreamReader(info.openStream());
Expand Down