Changes to close file manager client once done
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandler.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandler.java
index 00ef50f..d930d8f 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandler.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/CASProductHandler.java
@@ -18,7 +18,6 @@
package org.apache.oodt.cas.product;
-//JDK imports
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.Reference;
@@ -49,8 +48,6 @@
import static org.apache.oodt.cas.product.CASProductHandlerMetKeys.CAS_PROFILE_ID;
import static org.apache.oodt.cas.product.CASProductHandlerMetKeys.FILE_HEADER;
-//OODT imports
-
/**
* @author mattmann
* @version $Revision$
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DatasetDeliveryServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DatasetDeliveryServlet.java
index 9685e36..d04232c 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DatasetDeliveryServlet.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/data/DatasetDeliveryServlet.java
@@ -51,8 +51,7 @@
* @author mattmann
* @version $Revision$
*/
-public class DatasetDeliveryServlet extends HttpServlet implements
- DataDeliveryKeys {
+public class DatasetDeliveryServlet extends HttpServlet implements DataDeliveryKeys {
/* our log stream */
private static final Logger LOG = Logger
@@ -266,6 +265,14 @@
}
+ public void destroy() {
+ if (client != null) {
+ try {
+ client.close();
+ } catch (IOException ignored) { }
+ }
+ }
+
private boolean alreadyZipped(Product p, Map hash) {
return hash.containsKey(p.getProductName());
}
diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java
index e15faf4..bf4df9d 100644
--- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java
+++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rdf/RDFDatasetServlet.java
@@ -18,7 +18,7 @@
package org.apache.oodt.cas.product.rdf;
-//JDK imports
+
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.WordUtils;
@@ -32,15 +32,6 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.List;
-import java.util.Vector;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -53,8 +44,14 @@
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-
-//OODT imports
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.List;
+import java.util.Vector;
+import java.util.logging.Level;
+import java.util.logging.Logger;
/**
*
@@ -266,4 +263,13 @@
return types;
}
+ public void destroy() {
+ super.destroy();
+
+ if (fClient != null) {
+ try {
+ fClient.close();
+ } catch (IOException ignored) { }
+ }
+ }
}
