Close streams immediately after using them.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2575 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
@@ -1,11 +1,13 @@
|
||||
//
|
||||
// $Id: MisoTileManager.java,v 1.4 2003/01/13 22:55:12 mdb Exp $
|
||||
// $Id: MisoTileManager.java,v 1.5 2003/05/14 21:34:01 ray Exp $
|
||||
|
||||
package com.threerings.miso.tile;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
|
||||
import com.samskivert.io.StreamUtil;
|
||||
|
||||
import com.threerings.resource.ResourceManager;
|
||||
import com.threerings.util.CompiledConfig;
|
||||
|
||||
@@ -32,8 +34,9 @@ public class MisoTileManager extends TileManager
|
||||
super(imgr);
|
||||
|
||||
// look for a fringe configuration in the appropriate place
|
||||
InputStream in = null;
|
||||
try {
|
||||
InputStream in = rmgr.getResource(FRINGE_CONFIG_PATH);
|
||||
in = rmgr.getResource(FRINGE_CONFIG_PATH);
|
||||
FringeConfiguration config = (FringeConfiguration)
|
||||
CompiledConfig.loadConfig(in);
|
||||
|
||||
@@ -44,6 +47,9 @@ public class MisoTileManager extends TileManager
|
||||
Log.warning("Unable to load fringe configuration " +
|
||||
"[path=" + FRINGE_CONFIG_PATH +
|
||||
", error=" + ioe + "].");
|
||||
|
||||
} finally {
|
||||
StreamUtil.close(in);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
//
|
||||
// $Id: SparseMisoSceneParser.java,v 1.1 2003/04/19 22:40:34 mdb Exp $
|
||||
// $Id: SparseMisoSceneParser.java,v 1.2 2003/05/14 21:34:01 ray Exp $
|
||||
|
||||
package com.threerings.miso.tools.xml;
|
||||
|
||||
@@ -9,6 +9,7 @@ import java.io.FileInputStream;
|
||||
import org.xml.sax.SAXException;
|
||||
import org.apache.commons.digester.Digester;
|
||||
|
||||
import com.samskivert.io.StreamUtil;
|
||||
import com.samskivert.util.StringUtil;
|
||||
import com.threerings.tools.xml.NestableRuleSet;
|
||||
|
||||
@@ -55,7 +56,13 @@ public class SparseMisoSceneParser
|
||||
{
|
||||
_model = null;
|
||||
_digester.push(this);
|
||||
_digester.parse(new FileInputStream(path));
|
||||
FileInputStream stream = null;
|
||||
try {
|
||||
stream = new FileInputStream(path);
|
||||
_digester.parse(stream);
|
||||
} finally {
|
||||
StreamUtil.close(stream);
|
||||
}
|
||||
return _model;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user