From 08ae453c1cd08b7b861d66a718c9e43b40d30ff1 Mon Sep 17 00:00:00 2001 From: Murray Cumming Date: Fri, 20 Jul 2012 19:01:58 +0200 Subject: [PATCH] Some error checking. * src/main/java/org/glom/web/server/Log.java: Avoid using null strings. * src/main/java/org/glom/web/server/database/ListDBAccess.java: Avoid using a null Connection. --- ChangeLog | 8 +++ src/main/java/org/glom/web/server/Log.java | 66 +++++++++++----------- .../org/glom/web/server/database/ListDBAccess.java | 5 ++ 3 files changed, 47 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index ba216e9..2157d7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2012-07-20 Murray Cumming + Some error checking. + + * src/main/java/org/glom/web/server/Log.java: Avoid using null strings. + * src/main/java/org/glom/web/server/database/ListDBAccess.java: + Avoid using a null Connection. + +2012-07-20 Murray Cumming + tests: Add a ConfiguredDocument test. * src/test/java/org/glom/web/server/ConfiguredDocumentTest.java: diff --git a/src/main/java/org/glom/web/server/Log.java b/src/main/java/org/glom/web/server/Log.java index 93e0297..b83e475 100644 --- a/src/main/java/org/glom/web/server/Log.java +++ b/src/main/java/org/glom/web/server/Log.java @@ -19,6 +19,8 @@ package org.glom.web.server; +import org.apache.commons.lang3.StringUtils; + /** * A class that wraps methods in com.allen_sauer.gwt.log.client.Log to add the calling method name from the servlet to * log messages. @@ -27,110 +29,110 @@ public class Log { // Fatal methods public static void fatal(final String message, final Throwable e) { - com.allen_sauer.gwt.log.client.Log.fatal(getServletMethodName() + message, e); + com.allen_sauer.gwt.log.client.Log.fatal(getServletMethodName() + StringUtils.defaultString(message), e); } public static void fatal(final String message) { - com.allen_sauer.gwt.log.client.Log.fatal(getServletMethodName() + message); + com.allen_sauer.gwt.log.client.Log.fatal(getServletMethodName() + StringUtils.defaultString(message)); } public static void fatal(final String documentID, final String tableName, final String message, final Throwable e) { - com.allen_sauer.gwt.log.client.Log.fatal(getServletMethodName() + documentID + " - " + tableName + ": " - + message, e); + com.allen_sauer.gwt.log.client.Log.fatal(getServletMethodName() + StringUtils.defaultString(documentID) + " - " + StringUtils.defaultString(tableName) + ": " + + StringUtils.defaultString(message), e); } public static void fatal(final String documentID, final String tableName, final String message) { - com.allen_sauer.gwt.log.client.Log.fatal(getServletMethodName() + documentID + " - " + tableName + ": " - + message); + com.allen_sauer.gwt.log.client.Log.fatal(getServletMethodName() + StringUtils.defaultString(documentID) + " - " + StringUtils.defaultString(tableName) + ": " + + StringUtils.defaultString(message)); } public static void fatal(final String documentID, final String message, final Throwable e) { - com.allen_sauer.gwt.log.client.Log.fatal(getServletMethodName() + documentID + ": " + message, e); + com.allen_sauer.gwt.log.client.Log.fatal(getServletMethodName() + StringUtils.defaultString(documentID) + ": " + StringUtils.defaultString(message), e); } public static void fatal(final String documentID, final String message) { - com.allen_sauer.gwt.log.client.Log.fatal(getServletMethodName() + documentID + ": " + message); + com.allen_sauer.gwt.log.client.Log.fatal(getServletMethodName() + StringUtils.defaultString(documentID) + ": " + StringUtils.defaultString(message)); } // Error methods public static void error(final String message, final Throwable e) { - com.allen_sauer.gwt.log.client.Log.error(getServletMethodName() + message, e); + com.allen_sauer.gwt.log.client.Log.error(getServletMethodName() + StringUtils.defaultString(message), e); } public static void error(final String message) { - com.allen_sauer.gwt.log.client.Log.error(getServletMethodName() + message); + com.allen_sauer.gwt.log.client.Log.error(getServletMethodName() + StringUtils.defaultString(message)); } public static void error(final String documentID, final String tableName, final String message, final Throwable e) { - com.allen_sauer.gwt.log.client.Log.error(getServletMethodName() + documentID + " - " + tableName + ": " - + message, e); + com.allen_sauer.gwt.log.client.Log.error(getServletMethodName() + StringUtils.defaultString(documentID) + " - " + StringUtils.defaultString(tableName) + ": " + + StringUtils.defaultString(message), e); } public static void error(final String documentID, final String tableName, final String message) { - com.allen_sauer.gwt.log.client.Log.error(getServletMethodName() + documentID + " - " + tableName + ": " - + message); + com.allen_sauer.gwt.log.client.Log.error(getServletMethodName() + StringUtils.defaultString(documentID) + " - " + StringUtils.defaultString(tableName) + ": " + + StringUtils.defaultString(message)); } public static void error(final String documentID, final String message, final Throwable e) { - com.allen_sauer.gwt.log.client.Log.error(getServletMethodName() + documentID + ": " + message, e); + com.allen_sauer.gwt.log.client.Log.error(getServletMethodName() + StringUtils.defaultString(documentID) + ": " + StringUtils.defaultString(message), e); } public static void error(final String documentID, final String message) { - com.allen_sauer.gwt.log.client.Log.error(getServletMethodName() + documentID + ": " + message); + com.allen_sauer.gwt.log.client.Log.error(getServletMethodName() + StringUtils.defaultString(documentID) + ": " + StringUtils.defaultString(message)); } // Warning methods public static void warn(final String message, final Throwable e) { - com.allen_sauer.gwt.log.client.Log.fatal(getServletMethodName() + message, e); + com.allen_sauer.gwt.log.client.Log.fatal(getServletMethodName() + StringUtils.defaultString(message), e); } public static void warn(final String message) { - com.allen_sauer.gwt.log.client.Log.warn(getServletMethodName() + message); + com.allen_sauer.gwt.log.client.Log.warn(getServletMethodName() + StringUtils.defaultString(message)); } public static void warn(final String documentID, final String tableName, final String message, final Throwable e) { - com.allen_sauer.gwt.log.client.Log.warn(getServletMethodName() + documentID + " - " + tableName + ": " - + message, e); + com.allen_sauer.gwt.log.client.Log.warn(getServletMethodName() + StringUtils.defaultString(documentID) + " - " + StringUtils.defaultString(tableName) + ": " + + StringUtils.defaultString(message), e); } public static void warn(final String documentID, final String tableName, final String message) { - com.allen_sauer.gwt.log.client.Log.warn(getServletMethodName() + documentID + " - " + tableName + ": " - + message); + com.allen_sauer.gwt.log.client.Log.warn(getServletMethodName() + StringUtils.defaultString(documentID) + " - " + StringUtils.defaultString(tableName) + ": " + + StringUtils.defaultString(message)); } public static void warn(final String documentID, final String message, final Throwable e) { - com.allen_sauer.gwt.log.client.Log.warn(getServletMethodName() + documentID + ": " + message, e); + com.allen_sauer.gwt.log.client.Log.warn(getServletMethodName() + StringUtils.defaultString(documentID) + ": " + StringUtils.defaultString(message), e); } public static void warn(final String documentID, final String message) { - com.allen_sauer.gwt.log.client.Log.warn(getServletMethodName() + documentID + ": " + message); + com.allen_sauer.gwt.log.client.Log.warn(getServletMethodName() + StringUtils.defaultString(documentID) + ": " + StringUtils.defaultString(message)); } // Info methods public static void info(final String message, final Throwable e) { - com.allen_sauer.gwt.log.client.Log.info(getServletMethodName() + message, e); + com.allen_sauer.gwt.log.client.Log.info(getServletMethodName() + StringUtils.defaultString(message), e); } public static void info(final String message) { - com.allen_sauer.gwt.log.client.Log.info(getServletMethodName() + message); + com.allen_sauer.gwt.log.client.Log.info(getServletMethodName() + StringUtils.defaultString(message)); } public static void info(final String documentID, final String tableName, final String message, final Throwable e) { - com.allen_sauer.gwt.log.client.Log.info(getServletMethodName() + documentID + " - " + tableName + ": " - + message, e); + com.allen_sauer.gwt.log.client.Log.info(getServletMethodName() + StringUtils.defaultString(documentID) + " - " + StringUtils.defaultString(tableName) + ": " + + StringUtils.defaultString(message), e); } public static void info(final String documentID, final String tableName, final String message) { - com.allen_sauer.gwt.log.client.Log.info(getServletMethodName() + documentID + " - " + tableName + ": " - + message); + com.allen_sauer.gwt.log.client.Log.info(getServletMethodName() + StringUtils.defaultString(documentID) + " - " + StringUtils.defaultString(tableName) + ": " + + StringUtils.defaultString(message)); } public static void info(final String documentID, final String message, final Throwable e) { - com.allen_sauer.gwt.log.client.Log.info(getServletMethodName() + documentID + ": " + message, e); + com.allen_sauer.gwt.log.client.Log.info(getServletMethodName() + StringUtils.defaultString(documentID) + ": " + StringUtils.defaultString(message), e); } public static void info(final String documentID, final String message) { - com.allen_sauer.gwt.log.client.Log.info(getServletMethodName() + documentID + ": " + message); + com.allen_sauer.gwt.log.client.Log.info(getServletMethodName() + StringUtils.defaultString(documentID) + ": " + StringUtils.defaultString(message)); } // helper method diff --git a/src/main/java/org/glom/web/server/database/ListDBAccess.java b/src/main/java/org/glom/web/server/database/ListDBAccess.java index 959af46..d20be83 100644 --- a/src/main/java/org/glom/web/server/database/ListDBAccess.java +++ b/src/main/java/org/glom/web/server/database/ListDBAccess.java @@ -104,6 +104,11 @@ public abstract class ListDBAccess extends DBAccess { // of data. Here's the relevant PostgreSQL documentation: // http://jdbc.postgresql.org/documentation/83/query.html#query-with-cursor conn = cpds.getConnection(); + if(conn == null) { + Log.error(documentID, tableName, "The connection is null."); + return rowsList; + } + conn.setAutoCommit(false); st = conn.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY); st.setFetchSize(length); -- 2.1.4