You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2015/10/24 16:18:10 UTC
[2/6] oodt git commit: OODT-892 fix more null assignment issues
OODT-892 fix more null assignment issues
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/020d44fa
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/020d44fa
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/020d44fa
Branch: refs/heads/master
Commit: 020d44fa52b12d68fd28a460076fb48e667b0204
Parents: c212b1a
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sat Oct 24 14:35:59 2015 +0100
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sat Oct 24 14:35:59 2015 +0100
----------------------------------------------------------------------
.../catalog/LenientDataSourceCatalog.java | 367 +++++++++----------
.../cas/filemgr/catalog/ScienceDataCatalog.java | 58 +--
2 files changed, 186 insertions(+), 239 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/020d44fa/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LenientDataSourceCatalog.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LenientDataSourceCatalog.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LenientDataSourceCatalog.java
index 2c567d4..c2593fc 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LenientDataSourceCatalog.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LenientDataSourceCatalog.java
@@ -31,13 +31,11 @@ import org.apache.oodt.cas.filemgr.structs.exceptions.ValidationLayerException;
import org.apache.oodt.cas.filemgr.validation.ValidationLayer;
import org.apache.oodt.cas.metadata.Metadata;
-//JDK imports
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.text.SimpleDateFormat;
-import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -46,6 +44,8 @@ import java.util.logging.Logger;
import javax.sql.DataSource;
+//JDK imports
+
/**
* @author luca
* @version $Revision$
@@ -71,7 +71,6 @@ public class LenientDataSourceCatalog extends DataSourceCatalog {
* <p>
* Default Constructor
* </p>.
- * @throws
*/
public LenientDataSourceCatalog(DataSource ds, ValidationLayer valLayer,
boolean fieldId, int pageSize, long cacheUpdateMin, boolean productIdString, boolean orderedValues) {
@@ -110,27 +109,25 @@ public class LenientDataSourceCatalog extends DataSourceCatalog {
continue;
}
- for (Iterator<String> j = values.iterator(); j.hasNext();) {
- String value = j.next();
-
- try {
- addMetadataValue(metadataId, product, value);
- } catch (Exception e) {
- e.printStackTrace();
- LOG
- .log(
- Level.WARNING,
- "Exception ingesting metadata. Error inserting field: ["
- + metadataId
- + "=>"
- + value
- + "]: for product: ["
- + product.getProductName()
- + "]: Message: "
- + e.getMessage()
- + ": Attempting to continue processing metadata");
- }
+ for (String value : values) {
+ try {
+ addMetadataValue(metadataId, product, value);
+ } catch (Exception e) {
+ e.printStackTrace();
+ LOG
+ .log(
+ Level.WARNING,
+ "Exception ingesting metadata. Error inserting field: ["
+ + metadataId
+ + "=>"
+ + value
+ + "]: for product: ["
+ + product.getProductName()
+ + "]: Message: "
+ + e.getMessage()
+ + ": Attempting to continue processing metadata");
}
+ }
}
}
@@ -189,27 +186,25 @@ public class LenientDataSourceCatalog extends DataSourceCatalog {
List<String> values = m.getAllMetadata(metadataName);
if (values != null) {
- for (Iterator<String> j = values.iterator(); j.hasNext();) {
- String value = j.next();
-
- try {
- removeMetadataValue(metadataId, product, value);
- } catch (Exception e) {
- e.printStackTrace();
- LOG
- .log(
- Level.WARNING,
- "Exception removing metadata. Error deleting field: ["
- + metadataId
- + "=>"
- + value
- + "]: for product: ["
- + product.getProductName()
- + "]: Message: "
- + e.getMessage()
- + ": Attempting to continue processing metadata");
- }
+ for (String value : values) {
+ try {
+ removeMetadataValue(metadataId, product, value);
+ } catch (Exception e) {
+ e.printStackTrace();
+ LOG
+ .log(
+ Level.WARNING,
+ "Exception removing metadata. Error deleting field: ["
+ + metadataId
+ + "=>"
+ + value
+ + "]: for product: ["
+ + product.getProductName()
+ + "]: Message: "
+ + e.getMessage()
+ + ": Attempting to continue processing metadata");
}
+ }
}
}
}
@@ -248,7 +243,6 @@ public class LenientDataSourceCatalog extends DataSourceCatalog {
} catch (SQLException ignore) {
}
- rs = null;
}
if (statement != null) {
@@ -257,7 +251,6 @@ public class LenientDataSourceCatalog extends DataSourceCatalog {
} catch (SQLException ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -267,7 +260,6 @@ public class LenientDataSourceCatalog extends DataSourceCatalog {
} catch (SQLException ignore) {
}
- conn = null;
}
}
@@ -282,7 +274,7 @@ public class LenientDataSourceCatalog extends DataSourceCatalog {
if (getValidationLayer()!=null) {
// validation layer: retrieve valid metadata elements
- List<Element> elements = null;
+ List<Element> elements;
try {
elements = getValidationLayer().getElements(product.getProductType());
@@ -295,18 +287,16 @@ public class LenientDataSourceCatalog extends DataSourceCatalog {
}
while (rs.next()) {
- for (Iterator<Element> i = elements.iterator(); i.hasNext();) {
- Element e = i.next();
-
- // right now, we just support STRING
- String elemValue = rs.getString("metadata_value");
- String elemId = rs.getString("element_id");
+ for (Element e : elements) {
+ // right now, we just support STRING
+ String elemValue = rs.getString("metadata_value");
+ String elemId = rs.getString("element_id");
- if (elemId.equals(e.getElementId())) {
- elemValue = (elemValue != null ? elemValue : "");
- m.addMetadata(e.getElementName(), elemValue);
- }
+ if (elemId.equals(e.getElementId())) {
+ elemValue = (elemValue != null ? elemValue : "");
+ m.addMetadata(e.getElementName(), elemValue);
}
+ }
}
} else {
@@ -382,7 +372,6 @@ public class LenientDataSourceCatalog extends DataSourceCatalog {
} catch (SQLException ignore) {
}
- rs = null;
}
if (statement != null) {
@@ -391,7 +380,6 @@ public class LenientDataSourceCatalog extends DataSourceCatalog {
} catch (SQLException ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -401,7 +389,6 @@ public class LenientDataSourceCatalog extends DataSourceCatalog {
} catch (SQLException ignore) {
}
- conn = null;
}
}
@@ -423,23 +410,21 @@ public class LenientDataSourceCatalog extends DataSourceCatalog {
statement = conn.createStatement();
// build up the sql statement
- StringBuffer insertClauseSql = new StringBuffer();
- StringBuffer valueClauseSql = new StringBuffer();
+ StringBuilder valueClauseSql = new StringBuilder();
- insertClauseSql.append("INSERT INTO " + metadataTable
- + " (product_id, element_id, metadata_value) ");
- valueClauseSql.append("VALUES ");
+ valueClauseSql.append("VALUES ");
// now do the value clause
if (fieldIdStringFlag) {
- valueClauseSql.append("(" + quoteIt(product.getProductId()) + ", '"
- + key + "', '" + value + "')");
+ valueClauseSql.append("(").append(quoteIt(product.getProductId())).append(", '").append(key)
+ .append("', '").append(value).append("')");
} else {
- valueClauseSql.append("(" + product.getProductId() + ", "
- + key + ", '" + value + "')");
+ valueClauseSql.append("(").append(product.getProductId()).append(", ").append(key).append(", '")
+ .append(value).append("')");
}
- String metaIngestSql = insertClauseSql.toString()
+ String metaIngestSql = ("INSERT INTO " + metadataTable
+ + " (product_id, element_id, metadata_value) ")
+ valueClauseSql.toString();
LOG
.log(Level.FINE, "addMetadataValue: Executing: "
@@ -461,7 +446,9 @@ public class LenientDataSourceCatalog extends DataSourceCatalog {
LOG.log(Level.WARNING, "Exception adding metadata value. Message: "
+ e.getMessage());
try {
+ if (conn != null) {
conn.rollback();
+ }
} catch (SQLException e2) {
LOG.log(Level.SEVERE,
"Unable to rollback add metadata value. Message: "
@@ -475,7 +462,6 @@ public class LenientDataSourceCatalog extends DataSourceCatalog {
} catch (SQLException ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -485,7 +471,6 @@ public class LenientDataSourceCatalog extends DataSourceCatalog {
} catch (SQLException ignore) {
}
- conn = null;
}
}
}
@@ -529,7 +514,9 @@ public class LenientDataSourceCatalog extends DataSourceCatalog {
"Exception removing metadata value. Message: "
+ e.getMessage());
try {
+ if (conn != null) {
conn.rollback();
+ }
} catch (SQLException e2) {
LOG.log(Level.SEVERE,
"Unable to rollback remove metadata value. Message: "
@@ -543,7 +530,6 @@ public class LenientDataSourceCatalog extends DataSourceCatalog {
} catch (SQLException ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -553,7 +539,6 @@ public class LenientDataSourceCatalog extends DataSourceCatalog {
} catch (SQLException ignore) {
}
- conn = null;
}
}
}
@@ -573,137 +558,138 @@ public class LenientDataSourceCatalog extends DataSourceCatalog {
conn = dataSource.getConnection();
statement = conn.createStatement();
- String getProductSql = "";
+ String getProductSql;
String tableName = type.getName() + "_metadata";
String subSelectQueryBase = "SELECT product_id FROM " + tableName
+ " ";
- StringBuffer selectClause = new StringBuffer(
- "SELECT COUNT(DISTINCT p.product_id) AS numResults ");
- StringBuffer fromClause = new StringBuffer("FROM " + tableName
+ StringBuilder fromClause = new StringBuilder("FROM " + tableName
+ " p ");
- StringBuffer whereClause = new StringBuffer("WHERE ");
+ StringBuilder whereClause = new StringBuilder("WHERE ");
boolean gotFirstClause = false;
int clauseNum = 0;
if (query.getCriteria() != null && query.getCriteria().size() > 0) {
- for (Iterator<QueryCriteria> i = query.getCriteria().iterator(); i.hasNext();) {
- QueryCriteria criteria = i.next();
- clauseNum++;
-
- String elementIdStr = null;
-
- if (fieldIdStringFlag) {
- if (getValidationLayer()!=null) {
- elementIdStr = "'" + this.getValidationLayer().getElementByName(criteria.getElementName()).getElementId() + "'";
- } else {
- elementIdStr = "'" + criteria.getElementName() + "'";
- }
- } else {
- if (getValidationLayer()!=null) {
- elementIdStr = this.getValidationLayer().getElementByName(criteria.getElementName()).getElementId();
- } else {
- elementIdStr = criteria.getElementName();
- }
- }
+ for (QueryCriteria criteria : query.getCriteria()) {
+ clauseNum++;
+
+ String elementIdStr;
+
+ if (fieldIdStringFlag) {
+ if (getValidationLayer() != null) {
+ elementIdStr =
+ "'" + this.getValidationLayer().getElementByName(criteria.getElementName()).getElementId()
+ + "'";
+ } else {
+ elementIdStr = "'" + criteria.getElementName() + "'";
+ }
+ } else {
+ if (getValidationLayer() != null) {
+ elementIdStr = this.getValidationLayer().getElementByName(criteria.getElementName()).getElementId();
+ } else {
+ elementIdStr = criteria.getElementName();
+ }
+ }
- String clause = null;
-
- if (!gotFirstClause) {
- clause = "(p.element_id = " + elementIdStr + " AND ";
- if (criteria instanceof TermQueryCriteria) {
- clause += " metadata_value LIKE '%"
- + ((TermQueryCriteria) criteria).getValue()
- + "%') ";
- } else if (criteria instanceof RangeQueryCriteria) {
- String startVal = ((RangeQueryCriteria) criteria)
- .getStartValue();
- String endVal = ((RangeQueryCriteria) criteria)
- .getEndValue();
- boolean inclusive = ((RangeQueryCriteria) criteria)
- .getInclusive();
-
- if ((startVal != null && !startVal.equals(""))
- || (endVal != null && !endVal.equals(""))) {
- clause += " metadata_value ";
-
- boolean gotStart = false;
-
- if (startVal != null && !startVal.equals("")) {
- if (inclusive)
- clause += ">= '" + startVal + "'";
- else
- clause += "> '" + startVal + "'";
- gotStart = true;
- }
-
- if (endVal != null && !endVal.equals("")) {
- if (gotStart) {
- if (inclusive)
- clause += " AND metadata_value <= '"
- + endVal + "'";
- else
- clause += " AND metadata_value < '"
- + endVal + "'";
- } else if (inclusive)
- clause += "<= '" + endVal + "'";
- else
- clause += "< '" + endVal + "'";
- }
-
- clause += ") ";
- }
+ String clause;
+
+ if (!gotFirstClause) {
+ clause = "(p.element_id = " + elementIdStr + " AND ";
+ if (criteria instanceof TermQueryCriteria) {
+ clause += " metadata_value LIKE '%"
+ + ((TermQueryCriteria) criteria).getValue()
+ + "%') ";
+ } else if (criteria instanceof RangeQueryCriteria) {
+ String startVal = ((RangeQueryCriteria) criteria)
+ .getStartValue();
+ String endVal = ((RangeQueryCriteria) criteria)
+ .getEndValue();
+ boolean inclusive = ((RangeQueryCriteria) criteria)
+ .getInclusive();
+
+ if ((startVal != null && !startVal.equals(""))
+ || (endVal != null && !endVal.equals(""))) {
+ clause += " metadata_value ";
+
+ boolean gotStart = false;
+
+ if (startVal != null && !startVal.equals("")) {
+ if (inclusive) {
+ clause += ">= '" + startVal + "'";
+ } else {
+ clause += "> '" + startVal + "'";
}
- whereClause.append(clause);
- gotFirstClause = true;
- } else {
- String subSelectTblName = "p" + clauseNum;
- String subSelectQuery = subSelectQueryBase
- + "WHERE (element_id = " + elementIdStr
- + " AND ";
- if (criteria instanceof TermQueryCriteria) {
- subSelectQuery += " metadata_value LIKE '%"
- + ((TermQueryCriteria) criteria).getValue()
- + "%')";
- } else if (criteria instanceof RangeQueryCriteria) {
- String startVal = ((RangeQueryCriteria) criteria)
- .getStartValue();
- String endVal = ((RangeQueryCriteria) criteria)
- .getEndValue();
-
- if (startVal != null || endVal != null) {
- subSelectQuery += " metadata_value ";
-
- boolean gotStart = false;
-
- if (startVal != null && !startVal.equals("")) {
- subSelectQuery += ">= '" + startVal + "'";
- gotStart = true;
- }
-
- if (endVal != null && !endVal.equals("")) {
- if (gotStart) {
- subSelectQuery += " AND metadata_value <= '"
- + endVal + "'";
- } else
- subSelectQuery += "<= '" + endVal + "'";
- }
-
- subSelectQuery += ") ";
-
- }
+ gotStart = true;
+ }
+
+ if (endVal != null && !endVal.equals("")) {
+ if (gotStart) {
+ if (inclusive) {
+ clause += " AND metadata_value <= '"
+ + endVal + "'";
+ } else {
+ clause += " AND metadata_value < '"
+ + endVal + "'";
+ }
+ } else if (inclusive) {
+ clause += "<= '" + endVal + "'";
+ } else {
+ clause += "< '" + endVal + "'";
}
+ }
- fromClause.append("INNER JOIN (" + subSelectQuery
- + ") " + subSelectTblName + " ON "
- + subSelectTblName
- + ".product_id = p.product_id ");
+ clause += ") ";
+ }
+ }
+ whereClause.append(clause);
+ gotFirstClause = true;
+ } else {
+ String subSelectTblName = "p" + clauseNum;
+ String subSelectQuery = subSelectQueryBase
+ + "WHERE (element_id = " + elementIdStr
+ + " AND ";
+ if (criteria instanceof TermQueryCriteria) {
+ subSelectQuery += " metadata_value LIKE '%"
+ + ((TermQueryCriteria) criteria).getValue()
+ + "%')";
+ } else if (criteria instanceof RangeQueryCriteria) {
+ String startVal = ((RangeQueryCriteria) criteria)
+ .getStartValue();
+ String endVal = ((RangeQueryCriteria) criteria)
+ .getEndValue();
+
+ if (startVal != null || endVal != null) {
+ subSelectQuery += " metadata_value ";
+
+ boolean gotStart = false;
+
+ if (startVal != null && !startVal.equals("")) {
+ subSelectQuery += ">= '" + startVal + "'";
+ gotStart = true;
+ }
+
+ if (endVal != null && !endVal.equals("")) {
+ if (gotStart) {
+ subSelectQuery += " AND metadata_value <= '"
+ + endVal + "'";
+ } else {
+ subSelectQuery += "<= '" + endVal + "'";
+ }
+ }
+
+ subSelectQuery += ") ";
}
+ }
+
+ fromClause.append("INNER JOIN (").append(subSelectQuery).append(") ").append(subSelectTblName)
+ .append(" ON ").append(subSelectTblName).append(".product_id = p.product_id ");
+
}
+ }
}
- getProductSql = selectClause.toString() + fromClause.toString();
+ getProductSql = "SELECT COUNT(DISTINCT p.product_id) AS numResults " + fromClause.toString();
if (gotFirstClause) {
getProductSql += whereClause.toString();
}
@@ -724,7 +710,9 @@ public class LenientDataSourceCatalog extends DataSourceCatalog {
"Exception performing get num results. Message: "
+ e.getMessage());
try {
+ if (conn != null) {
conn.rollback();
+ }
} catch (SQLException e2) {
LOG.log(Level.SEVERE,
"Unable to rollback get num results transaction. Message: "
@@ -739,7 +727,6 @@ public class LenientDataSourceCatalog extends DataSourceCatalog {
} catch (SQLException ignore) {
}
- rs = null;
}
if (statement != null) {
@@ -748,7 +735,6 @@ public class LenientDataSourceCatalog extends DataSourceCatalog {
} catch (SQLException ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -758,7 +744,6 @@ public class LenientDataSourceCatalog extends DataSourceCatalog {
} catch (SQLException ignore) {
}
- conn = null;
}
}
@@ -769,7 +754,7 @@ public class LenientDataSourceCatalog extends DataSourceCatalog {
* Overridden method from superclass to allow for null validation layer.
*/
protected String getSqlQuery(QueryCriteria queryCriteria, ProductType type) throws ValidationLayerException, CatalogException {
- String sqlQuery = null;
+ String sqlQuery;
if (queryCriteria instanceof BooleanQueryCriteria) {
BooleanQueryCriteria bqc = (BooleanQueryCriteria) queryCriteria;
if (bqc.getOperator() == BooleanQueryCriteria.NOT) {
http://git-wip-us.apache.org/repos/asf/oodt/blob/020d44fa/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalog.java
----------------------------------------------------------------------
diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalog.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalog.java
index 0074bb7..cf8268f 100644
--- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalog.java
+++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/ScienceDataCatalog.java
@@ -24,7 +24,6 @@ import java.sql.Statement;
import java.util.Calendar;
import java.util.Collections;
import java.util.Enumeration;
-import java.util.Iterator;
import java.util.List;
import java.util.Vector;
import java.util.logging.Level;
@@ -34,7 +33,6 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
//OODT imports
-import org.apache.oodt.cas.filemgr.catalog.Catalog;
import org.apache.oodt.cas.filemgr.structs.Product;
import org.apache.oodt.cas.filemgr.structs.ProductPage;
import org.apache.oodt.cas.filemgr.structs.ProductType;
@@ -218,9 +216,8 @@ public class ScienceDataCatalog implements Catalog {
try {
conn = this.dataSource.getConnection();
conn.setAutoCommit(true);
- int count = 0;
statement = conn.createStatement();
- ResultSet rs = statement.executeQuery(queryExists.toString());
+ ResultSet rs = statement.executeQuery(queryExists);
while (rs.next()) {
granuleId = rs.getInt("granule_id");
}
@@ -237,7 +234,6 @@ public class ScienceDataCatalog implements Catalog {
} catch (SQLException ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -246,7 +242,6 @@ public class ScienceDataCatalog implements Catalog {
} catch (SQLException ignore) {
}
- conn = null;
}
}
@@ -279,7 +274,7 @@ public class ScienceDataCatalog implements Catalog {
conn.setAutoCommit(true);
int count = 0;
statement = conn.createStatement();
- ResultSet rs = statement.executeQuery(queryExists.toString());
+ ResultSet rs = statement.executeQuery(queryExists);
while (rs.next()) {
parameterId = rs.getInt("parameter_id");
}
@@ -296,7 +291,6 @@ public class ScienceDataCatalog implements Catalog {
} catch (SQLException ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -305,7 +299,6 @@ public class ScienceDataCatalog implements Catalog {
} catch (SQLException ignore) {
}
- conn = null;
}
}
@@ -355,7 +348,9 @@ public class ScienceDataCatalog implements Catalog {
"SQL Exception adding product metadata. Last query was: " + query
+ " , Message: " + e.getMessage());
try {
- conn.rollback();
+ if (conn != null) {
+ conn.rollback();
+ }
} catch (SQLException e2) {
LOG.log(
Level.SEVERE,
@@ -370,7 +365,6 @@ public class ScienceDataCatalog implements Catalog {
} catch (SQLException ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -379,7 +373,6 @@ public class ScienceDataCatalog implements Catalog {
} catch (SQLException ignore) {
}
- conn = null;
}
}
}
@@ -432,7 +425,6 @@ public class ScienceDataCatalog implements Catalog {
rs.close();
} catch (Exception ignore) {
}
- rs = null;
}
if (statement != null) {
@@ -440,7 +432,6 @@ public class ScienceDataCatalog implements Catalog {
statement.close();
} catch (Exception ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -448,7 +439,6 @@ public class ScienceDataCatalog implements Catalog {
conn.close();
} catch (Exception ignore) {
}
- conn = null;
}
}
@@ -478,7 +468,6 @@ public class ScienceDataCatalog implements Catalog {
rs.close();
} catch (Exception ignore) {
}
- rs = null;
}
if (statement != null) {
@@ -486,7 +475,6 @@ public class ScienceDataCatalog implements Catalog {
statement.close();
} catch (Exception ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -494,7 +482,6 @@ public class ScienceDataCatalog implements Catalog {
conn.close();
} catch (Exception ignore) {
}
- conn = null;
}
}
@@ -525,7 +512,6 @@ public class ScienceDataCatalog implements Catalog {
rs.close();
} catch (Exception ignore) {
}
- rs = null;
}
if (statement != null) {
@@ -533,7 +519,6 @@ public class ScienceDataCatalog implements Catalog {
statement.close();
} catch (Exception ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -541,7 +526,6 @@ public class ScienceDataCatalog implements Catalog {
conn.close();
} catch (Exception ignore) {
}
- conn = null;
}
}
@@ -576,7 +560,6 @@ public class ScienceDataCatalog implements Catalog {
rs.close();
} catch (Exception ignore) {
}
- rs = null;
}
if (statement != null) {
@@ -584,7 +567,6 @@ public class ScienceDataCatalog implements Catalog {
statement.close();
} catch (Exception ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -592,7 +574,6 @@ public class ScienceDataCatalog implements Catalog {
conn.close();
} catch (Exception ignore) {
}
- conn = null;
}
}
@@ -624,7 +605,6 @@ public class ScienceDataCatalog implements Catalog {
rs.close();
} catch (Exception ignore) {
}
- rs = null;
}
if (statement != null) {
@@ -632,7 +612,6 @@ public class ScienceDataCatalog implements Catalog {
statement.close();
} catch (Exception ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -640,7 +619,6 @@ public class ScienceDataCatalog implements Catalog {
conn.close();
} catch (Exception ignore) {
}
- conn = null;
}
}
@@ -685,7 +663,6 @@ public class ScienceDataCatalog implements Catalog {
rs.close();
} catch (Exception ignore) {
}
- rs = null;
}
if (statement != null) {
@@ -693,7 +670,6 @@ public class ScienceDataCatalog implements Catalog {
statement.close();
} catch (Exception ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -701,7 +677,6 @@ public class ScienceDataCatalog implements Catalog {
conn.close();
} catch (Exception ignore) {
}
- conn = null;
}
}
@@ -736,7 +711,6 @@ public class ScienceDataCatalog implements Catalog {
rs.close();
} catch (Exception ignore) {
}
- rs = null;
}
if (statement != null) {
@@ -744,7 +718,6 @@ public class ScienceDataCatalog implements Catalog {
statement.close();
} catch (Exception ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -752,7 +725,6 @@ public class ScienceDataCatalog implements Catalog {
conn.close();
} catch (Exception ignore) {
}
- conn = null;
}
}
@@ -922,8 +894,7 @@ public class ScienceDataCatalog implements Catalog {
if (productIds != null && productIds.size() > 0) {
List<Product> products = new Vector<Product>(productIds.size());
- for (Iterator<String> i = productIds.iterator(); i.hasNext();) {
- String productId = i.next();
+ for (String productId : productIds) {
Product p = getProductById(productId);
products.add(p);
}
@@ -971,7 +942,7 @@ public class ScienceDataCatalog implements Catalog {
// must call next first, or else no relative cursor
if (rs.next()) {
// grab the first one
- int numGrabbed = -1;
+ int numGrabbed;
if (pageNum == 1) {
numGrabbed = 1;
@@ -1005,7 +976,9 @@ public class ScienceDataCatalog implements Catalog {
LOG.log(Level.WARNING,
"Exception performing query. Message: " + e.getMessage());
try {
- conn.rollback();
+ if (conn != null) {
+ conn.rollback();
+ }
} catch (SQLException e2) {
LOG.log(Level.SEVERE, "Unable to rollback query transaction. Message: "
+ e2.getMessage());
@@ -1019,7 +992,6 @@ public class ScienceDataCatalog implements Catalog {
} catch (SQLException ignore) {
}
- rs = null;
}
if (statement != null) {
@@ -1028,7 +1000,6 @@ public class ScienceDataCatalog implements Catalog {
} catch (SQLException ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -1038,7 +1009,6 @@ public class ScienceDataCatalog implements Catalog {
} catch (SQLException ignore) {
}
- conn = null;
}
}
@@ -1078,7 +1048,6 @@ public class ScienceDataCatalog implements Catalog {
statement.close();
} catch (Exception ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -1086,7 +1055,6 @@ public class ScienceDataCatalog implements Catalog {
conn.close();
} catch (Exception ignore) {
}
- conn = null;
}
}
@@ -1122,7 +1090,6 @@ public class ScienceDataCatalog implements Catalog {
rs.close();
} catch (Exception ignore) {
}
- rs = null;
}
if (statement != null) {
@@ -1130,7 +1097,6 @@ public class ScienceDataCatalog implements Catalog {
statement.close();
} catch (Exception ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -1138,7 +1104,6 @@ public class ScienceDataCatalog implements Catalog {
conn.close();
} catch (Exception ignore) {
}
- conn = null;
}
}
@@ -1174,7 +1139,6 @@ public class ScienceDataCatalog implements Catalog {
rs.close();
} catch (Exception ignore) {
}
- rs = null;
}
if (statement != null) {
@@ -1182,7 +1146,6 @@ public class ScienceDataCatalog implements Catalog {
statement.close();
} catch (Exception ignore) {
}
- statement = null;
}
if (conn != null) {
@@ -1190,7 +1153,6 @@ public class ScienceDataCatalog implements Catalog {
conn.close();
} catch (Exception ignore) {
}
- conn = null;
}
}