[Mulgara-svn] r2041 - in trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational: . d2rq
alexhall at mulgara.org
alexhall at mulgara.org
Fri Sep 23 22:11:04 UTC 2011
Author: alexhall
Date: 2011-09-23 22:11:04 +0000 (Fri, 23 Sep 2011)
New Revision: 2041
Modified:
trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/BNodeDesc.java
trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/ColumnDesc.java
trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/LiteralDesc.java
trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/PatternDesc.java
trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RedirectDesc.java
trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalAnswer.java
trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalQuery.java
trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalResolver.java
trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalTransformer.java
trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/d2rq/Definition.java
trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/d2rq/ObjectPropertyBridgeElem.java
Log:
More updates for Fortify compliance
Modified: trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/BNodeDesc.java
===================================================================
--- trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/BNodeDesc.java 2011-09-23 20:18:16 UTC (rev 2040)
+++ trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/BNodeDesc.java 2011-09-23 22:11:04 UTC (rev 2041)
@@ -58,7 +58,7 @@
public class BNodeDesc extends VariableDesc {
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(RelationalResolver.class);
+ private static final Logger logger = Logger.getLogger(RelationalResolver.class);
private final Set<String> tables;
private final Set<String> columns;
Modified: trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/ColumnDesc.java
===================================================================
--- trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/ColumnDesc.java 2011-09-23 20:18:16 UTC (rev 2040)
+++ trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/ColumnDesc.java 2011-09-23 22:11:04 UTC (rev 2041)
@@ -67,7 +67,7 @@
public class ColumnDesc extends VariableDesc {
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(ColumnDesc.class);
+ private static final Logger logger = Logger.getLogger(ColumnDesc.class);
private String column;
private String table;
Modified: trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/LiteralDesc.java
===================================================================
--- trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/LiteralDesc.java 2011-09-23 20:18:16 UTC (rev 2040)
+++ trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/LiteralDesc.java 2011-09-23 22:11:04 UTC (rev 2041)
@@ -60,7 +60,7 @@
import org.mulgara.util.StackTrace;
public class LiteralDesc extends VariableDesc {
- private static Logger logger = Logger.getLogger(LiteralDesc.class);
+ private static final Logger logger = Logger.getLogger(LiteralDesc.class);
private int index = -1;
// p used for debugging purposes.
Modified: trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/PatternDesc.java
===================================================================
--- trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/PatternDesc.java 2011-09-23 20:18:16 UTC (rev 2040)
+++ trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/PatternDesc.java 2011-09-23 22:11:04 UTC (rev 2041)
@@ -74,7 +74,7 @@
private enum UriEncoding { NONE, URLENCODING, URLIFY }
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(PatternDesc.class);
+ private static final Logger logger = Logger.getLogger(PatternDesc.class);
private Set<String> tables;
private Set<String> columns;
Modified: trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RedirectDesc.java
===================================================================
--- trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RedirectDesc.java 2011-09-23 20:18:16 UTC (rev 2040)
+++ trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RedirectDesc.java 2011-09-23 22:11:04 UTC (rev 2041)
@@ -55,7 +55,7 @@
public class RedirectDesc extends VariableDesc {
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(RedirectDesc.class);
+ private static final Logger logger = Logger.getLogger(RedirectDesc.class);
private List<VariableDesc> descs;
private int index;
Modified: trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalAnswer.java
===================================================================
--- trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalAnswer.java 2011-09-23 20:18:16 UTC (rev 2040)
+++ trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalAnswer.java 2011-09-23 22:11:04 UTC (rev 2041)
@@ -59,7 +59,7 @@
import org.mulgara.query.Variable;
public class RelationalAnswer extends AbstractAnswer implements Answer {
- private static Logger logger = Logger.getLogger(RelationalAnswer.class.getName());
+ private static final Logger logger = Logger.getLogger(RelationalAnswer.class.getName());
private Connection conn;
private Statement statement;
Modified: trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalQuery.java
===================================================================
--- trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalQuery.java 2011-09-23 20:18:16 UTC (rev 2040)
+++ trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalQuery.java 2011-09-23 22:11:04 UTC (rev 2041)
@@ -71,7 +71,7 @@
public class RelationalQuery {
/** Logger */
- private static Logger logger = Logger.getLogger(RelationalQuery.class);
+ private static final Logger logger = Logger.getLogger(RelationalQuery.class);
private Set<String> tableSet;
private List<String> columnList;
Modified: trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalResolver.java
===================================================================
--- trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalResolver.java 2011-09-23 20:18:16 UTC (rev 2040)
+++ trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalResolver.java 2011-09-23 22:11:04 UTC (rev 2041)
@@ -82,7 +82,7 @@
public class RelationalResolver implements Resolver {
/** Logger */
- private static Logger logger = Logger.getLogger(RelationalResolver.class);
+ private static final Logger logger = Logger.getLogger(RelationalResolver.class);
/** System model's type URI */
private URI systemModelTypeURI;
Modified: trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalTransformer.java
===================================================================
--- trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalTransformer.java 2011-09-23 20:18:16 UTC (rev 2040)
+++ trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/RelationalTransformer.java 2011-09-23 22:11:04 UTC (rev 2041)
@@ -65,7 +65,7 @@
public class RelationalTransformer extends AbstractSymbolicTransformer {
/** Logger */
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(RelationalTransformer.class);
+ private static final Logger logger = Logger.getLogger(RelationalTransformer.class);
private URI modelTypeURI;
Modified: trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/d2rq/Definition.java
===================================================================
--- trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/d2rq/Definition.java 2011-09-23 20:18:16 UTC (rev 2040)
+++ trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/d2rq/Definition.java 2011-09-23 22:11:04 UTC (rev 2041)
@@ -62,7 +62,7 @@
/** Logger */
@SuppressWarnings("unused")
- private static Logger logger = Logger.getLogger(Definition.class);
+ private static final Logger logger = Logger.getLogger(Definition.class);
public DatabaseElem databaseDefn;
public Map<String,ClassMapElem> classMaps; // Map of class-type to class-defn.
@@ -131,8 +131,11 @@
try {
props = TuplesOperations.join(lhs, rhs);
} finally {
- lhs.close();
- rhs.close();
+ try {
+ lhs.close();
+ } finally {
+ rhs.close();
+ }
}
props.beforeFirst();
while (props.next()) {
Modified: trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/d2rq/ObjectPropertyBridgeElem.java
===================================================================
--- trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/d2rq/ObjectPropertyBridgeElem.java 2011-09-23 20:18:16 UTC (rev 2040)
+++ trunk/src/jar/resolver-relational/java/org/mulgara/resolver/relational/d2rq/ObjectPropertyBridgeElem.java 2011-09-23 22:11:04 UTC (rev 2041)
@@ -55,7 +55,7 @@
public class ObjectPropertyBridgeElem extends PropertyBridgeElem {
/** Logger */
- private static Logger logger = Logger.getLogger(Definition.class);
+ private static final Logger logger = Logger.getLogger(Definition.class);
public final String column;
public final String pattern;
More information about the Mulgara-svn
mailing list