close some input/output streams
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/c2ac6258 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/c2ac6258 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/c2ac6258 Branch: refs/heads/master Commit: c2ac62586ff2844021b8a7b0fbf8500e92dcc8fb Parents: 2d6a7f5 Author: Tom Barber <[email protected]> Authored: Fri Oct 30 10:09:42 2015 +0000 Committer: Tom Barber <[email protected]> Committed: Fri Oct 30 10:09:42 2015 +0000 ---------------------------------------------------------------------- .../cas/curation/service/MetadataResource.java | 10 ++++++++-- .../cas/curation/util/ExtractorConfigReader.java | 12 +++++++++--- .../cas/curation/util/ExtractorConfigWriter.java | 12 +++++++++--- .../catalog/MappedDataSourceCatalogFactory.java | 9 ++++++++- .../oodt/cas/filemgr/ingest/CachedIngester.java | 19 +++++++++++++++---- 5 files changed, 49 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/c2ac6258/curator/services/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java ---------------------------------------------------------------------- diff --git a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java index df43653..1335240 100644 --- a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java +++ b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java @@ -52,6 +52,7 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import java.util.ArrayList; @@ -594,8 +595,13 @@ public class MetadataResource extends CurationService { */ public void updateCatalogMetadata(Product product, Metadata newMetadata) throws CatalogException, IOException { - System.getProperties().load( - new FileInputStream(CurationService.config.getFileMgrProps())); + InputStream is = new FileInputStream(CurationService.config.getFileMgrProps()); + try { + System.getProperties().load(is); + } + finally{ + is.close(); + } Catalog catalog = this.getCatalog(); Metadata oldMetadata = catalog.getMetadata(product); http://git-wip-us.apache.org/repos/asf/oodt/blob/c2ac6258/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigReader.java ---------------------------------------------------------------------- diff --git a/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigReader.java b/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigReader.java index 54c341c..9f7f9e2 100644 --- a/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigReader.java +++ b/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigReader.java @@ -24,6 +24,7 @@ import org.apache.oodt.cas.metadata.util.PathUtils; import java.io.File; import java.io.FileInputStream; import java.io.IOException; +import java.io.InputStream; import java.util.ArrayList; import java.util.List; import java.util.Properties; @@ -33,9 +34,14 @@ public class ExtractorConfigReader { String configId) throws IOException { File propsFileDir = new File(directory, configId); Properties props = new Properties(); - props - .load(new FileInputStream(new File(propsFileDir, - "config.properties"))); + InputStream is = new FileInputStream(new File(propsFileDir, + "config.properties")); + try { + props.load(is); + } + finally{ + is.close(); + } String className = props.getProperty(ExtractorConfig.PROP_CLASS_NAME); List<File> files = new ArrayList<File>(); http://git-wip-us.apache.org/repos/asf/oodt/blob/c2ac6258/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigWriter.java ---------------------------------------------------------------------- diff --git a/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigWriter.java b/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigWriter.java index 82b19fc..3ca26a5 100644 --- a/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigWriter.java +++ b/curator/services/src/main/java/org/apache/oodt/cas/curation/util/ExtractorConfigWriter.java @@ -23,6 +23,7 @@ import org.apache.oodt.cas.curation.structs.ExtractorConfig; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; +import java.io.OutputStream; import java.util.Properties; import java.util.Iterator; @@ -42,9 +43,14 @@ public class ExtractorConfigWriter { files.append(","); } props.setProperty(ExtractorConfig.PROP_CONFIG_FILES, files.toString()); - props - .store(new FileOutputStream(new File(configDir, "config.properties")), - ""); + OutputStream os = new FileOutputStream(new File(configDir, "config.properties")); + try { + props + .store(os, ""); + } + finally{ + os.close(); + } } } http://git-wip-us.apache.org/repos/asf/oodt/blob/c2ac6258/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/MappedDataSourceCatalogFactory.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/MappedDataSourceCatalogFactory.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/MappedDataSourceCatalogFactory.java index 75dcf3c..a31e49f 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/MappedDataSourceCatalogFactory.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/MappedDataSourceCatalogFactory.java @@ -23,6 +23,7 @@ import org.apache.oodt.cas.metadata.util.PathUtils; //JDK imports import java.io.FileInputStream; import java.io.IOException; +import java.io.InputStream; import java.util.Properties; @@ -52,7 +53,13 @@ public class MappedDataSourceCatalogFactory extends DataSourceCatalogFactory { String mapFilePath = PathUtils.replaceEnvVariables(System .getProperty(TYPE_MAP_KEY)); Properties props = new Properties(); - props.load(new FileInputStream(mapFilePath)); + InputStream is = new FileInputStream(mapFilePath); + try { + props.load(is); + } + finally{ + is.close(); + } this.typeMap = props; } http://git-wip-us.apache.org/repos/asf/oodt/blob/c2ac6258/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CachedIngester.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CachedIngester.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CachedIngester.java index efb6a40..8e96be1 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CachedIngester.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/ingest/CachedIngester.java @@ -18,17 +18,20 @@ package org.apache.oodt.cas.filemgr.ingest; //JDK imports + +import org.apache.oodt.cas.filemgr.structs.exceptions.CacheException; +import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException; +import org.apache.oodt.cas.filemgr.util.GenericFileManagerObjectFactory; + import java.io.File; import java.io.FileInputStream; +import java.io.InputStream; import java.net.URISyntaxException; import java.net.URL; import java.util.logging.Level; import java.util.logging.Logger; //OODT imports -import org.apache.oodt.cas.filemgr.structs.exceptions.CacheException; -import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException; -import org.apache.oodt.cas.filemgr.util.GenericFileManagerObjectFactory; /** * @author mattmann @@ -66,13 +69,21 @@ public class CachedIngester extends StdIngester { public CachedIngester(String transferService, String cacheServiceFactory, String cachePropFile) throws InstantiationException { super(transferService); + try { - System.getProperties().load(new FileInputStream(cachePropFile)); + InputStream is = new FileInputStream(cachePropFile); + try { + System.getProperties().load(is); + } + finally{ + is.close(); + } } catch (Exception e) { throw new InstantiationException( "Unable to load cache properties from file: [" + cachePropFile + "]"); } + this.cache = GenericFileManagerObjectFactory .getCacheFromFactory(cacheServiceFactory); init(this.cache);
