diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/util/OperationUtils.java b/api/src/main/java/edu/cornell/mannlib/vedit/util/OperationUtils.java
index f4463f255..6b0e36803 100644
--- a/api/src/main/java/edu/cornell/mannlib/vedit/util/OperationUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vedit/util/OperationUtils.java
@@ -46,19 +46,21 @@ public class OperationUtils {
}
}
- Object[] arglist = new Object[1];
- if (isInt)
- arglist[0] = Integer.decode(value);
- else if (isBoolean)
- arglist[0] = (value.equalsIgnoreCase("TRUE"));
- else
- arglist[0] = value;
- try {
- setterMethod.invoke(newObj, arglist);
- } catch (Exception e) {
- log.error("Couldn't invoke method");
- log.error(e.getMessage());
- log.error(field + " " + arglist[0]);
+ if (setterMethod != null) {
+ Object[] arglist = new Object[1];
+ if (isInt)
+ arglist[0] = Integer.decode(value);
+ else if (isBoolean)
+ arglist[0] = (value.equalsIgnoreCase("TRUE"));
+ else
+ arglist[0] = value;
+ try {
+ setterMethod.invoke(newObj, arglist);
+ } catch (Exception e) {
+ log.error("Couldn't invoke method");
+ log.error(e.getMessage());
+ log.error(field + " " + arglist[0]);
+ }
}
}
diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/util/Stemmer.java b/api/src/main/java/edu/cornell/mannlib/vedit/util/Stemmer.java
index 5b84d7053..3283b69e9 100644
--- a/api/src/main/java/edu/cornell/mannlib/vedit/util/Stemmer.java
+++ b/api/src/main/java/edu/cornell/mannlib/vedit/util/Stemmer.java
@@ -480,7 +480,7 @@ class Stemmer
outputStr.append(u);
}
- return outputStr == null || outputStr.length() == 0 ? null : outputStr.toString().trim();
+ return outputStr.length() == 0 ? null : outputStr.toString().trim();
}
/*
diff --git a/api/src/main/java/edu/ucsf/vitro/opensocial/GadgetSpec.java b/api/src/main/java/edu/ucsf/vitro/opensocial/GadgetSpec.java
index 251113b7f..b91d2b035 100644
--- a/api/src/main/java/edu/ucsf/vitro/opensocial/GadgetSpec.java
+++ b/api/src/main/java/edu/ucsf/vitro/opensocial/GadgetSpec.java
@@ -32,36 +32,20 @@ public class GadgetSpec {
// Load gadgets from the DB first
if (!unknownGadget) {
- Connection conn = null;
- Statement stmt = null;
- ResultSet rset = null;
- try {
- String sqlCommand = "select page, viewer_req, owner_req, view, chromeId, opt_params, display_order from orng_app_views where appId = "
- + appId;
- conn = ds.getConnection();
- stmt = conn.createStatement();
- rset = stmt.executeQuery(sqlCommand);
- while (rset.next()) {
- viewRequirements.put(
- rset.getString(1),
- new GadgetViewRequirements(rset.getString(1), rset
- .getString(2), rset.getString(3), rset
- .getString(4), rset.getString(5), rset
- .getString(6), rset.getInt(7)));
- }
- } finally {
- try {
- rset.close();
- } catch (Exception e) {
- }
- try {
- stmt.close();
- } catch (Exception e) {
- }
- try {
- conn.close();
- } catch (Exception e) {
+ String sqlCommand = "select page, viewer_req, owner_req, view, chromeId, opt_params, display_order from orng_app_views where appId = " + appId;
+ try (Connection conn = ds.getConnection()) {
+ try (Statement stmt = conn.createStatement()) {
+ try (ResultSet rset = stmt.executeQuery(sqlCommand)) {
+ while (rset.next()) {
+ viewRequirements.put(
+ rset.getString(1),
+ new GadgetViewRequirements(rset.getString(1), rset
+ .getString(2), rset.getString(3), rset
+ .getString(4), rset.getString(5), rset
+ .getString(6), rset.getInt(7)));
+ }
+ }
}
}
}
@@ -127,31 +111,15 @@ public class GadgetSpec {
throws SQLException {
int count = 0;
- Connection conn = null;
- Statement stmt = null;
- ResultSet rset = null;
+ String sqlCommand = "select count(*) from orng_app_registry where appId = " + getAppId() + " and personId = '" + personId + "';";
- try {
- String sqlCommand = "select count(*) from orng_app_registry where appId = "
- + getAppId() + " and personId = '" + personId + "';";
- conn = ds.getConnection();
- stmt = conn.createStatement();
- rset = stmt.executeQuery(sqlCommand);
- while (rset.next()) {
- count = rset.getInt(1);
- }
- } finally {
- try {
- rset.close();
- } catch (Exception e) {
- }
- try {
- stmt.close();
- } catch (Exception e) {
- }
- try {
- conn.close();
- } catch (Exception e) {
+ try (Connection conn = ds.getConnection()) {
+ try (Statement stmt = conn.createStatement()) {
+ try (ResultSet rset = stmt.executeQuery(sqlCommand)) {
+ while (rset.next()) {
+ count = rset.getInt(1);
+ }
+ }
}
}
diff --git a/api/src/main/java/edu/ucsf/vitro/opensocial/OpenSocialManager.java b/api/src/main/java/edu/ucsf/vitro/opensocial/OpenSocialManager.java
index a00d17399..2b1f237a2 100644
--- a/api/src/main/java/edu/ucsf/vitro/opensocial/OpenSocialManager.java
+++ b/api/src/main/java/edu/ucsf/vitro/opensocial/OpenSocialManager.java
@@ -294,28 +294,17 @@ public class OpenSocialManager {
public void postActivity(int userId, String title, String body,
String xtraId1Type, String xtraId1Value) throws SQLException {
- Connection conn = null;
- Statement stmt = null;
String sqlCommand = "INSERT INTO orng_activity (userId, activity, xtraId1Type, xtraId1Value) VALUES ('"
+ userId + "','"
+ System.currentTimeMillis() + "" + title + ""
+ (body != null ? "" + body + "" : "") + "','"
- + xtraId1Type + "','" + xtraId1Value + "');";
- try {
- conn = dataSource.getConnection();
- stmt = conn.createStatement();
- stmt.executeUpdate(sqlCommand);
- } finally {
- try {
- stmt.close();
- } catch (Exception e) {
- }
- try {
- conn.close();
- } catch (Exception e) {
+ + xtraId1Type + "','" + xtraId1Value + "');";
+
+ try (Connection conn = dataSource.getConnection()) {
+ try (Statement stmt = conn.createStatement()) {
+ stmt.executeUpdate(sqlCommand);
}
}
-
}
private String socketSendReceive(String viewer, String owner, String gadget)
@@ -388,41 +377,24 @@ public class OpenSocialManager {
Map allDBGadgets = useCache ? gadgetCache : null;
if (allDBGadgets == null) {
allDBGadgets = new HashMap();
- Connection conn = null;
- Statement stmt = null;
- ResultSet rset = null;
- try {
-
- String sqlCommand = "select appId, name, url, channels, enabled from orng_apps";
-
- conn = dataSource.getConnection();
- stmt = conn.createStatement();
- rset = stmt.executeQuery(sqlCommand);
-
- while (rset.next()) {
- String channelsStr = rset.getString(4);
- List channels = Arrays.asList(channelsStr != null && channelsStr.length() > 0 ? channelsStr.split(" ") : new String[0]);
- GadgetSpec spec = new GadgetSpec(rset.getInt(1),
- rset.getString(2), rset.getString(3), channels, dataSource, rset.getBoolean(5), false);
- String gadgetFileName = getGadgetFileNameFromURL(rset.getString(3));
-
- allDBGadgets.put(gadgetFileName, spec);
- }
- }
- finally {
- try {
- rset.close();
- } catch (Exception e) {
- }
- try {
- stmt.close();
- } catch (Exception e) {
- }
- try {
- conn.close();
- } catch (Exception e) {
+ String sqlCommand = "select appId, name, url, channels, enabled from orng_apps";
+
+ try (Connection conn = dataSource.getConnection()) {
+ try (Statement stmt = conn.createStatement()) {
+ try (ResultSet rset = stmt.executeQuery(sqlCommand)) {
+ while (rset.next()) {
+ String channelsStr = rset.getString(4);
+ List channels = Arrays.asList(channelsStr != null && channelsStr.length() > 0 ? channelsStr.split(" ") : new String[0]);
+ GadgetSpec spec = new GadgetSpec(rset.getInt(1),
+ rset.getString(2), rset.getString(3), channels, dataSource, rset.getBoolean(5), false);
+ String gadgetFileName = getGadgetFileNameFromURL(rset.getString(3));
+
+ allDBGadgets.put(gadgetFileName, spec);
+ }
+ }
}
}
+
if (useCache) {
gadgetCache = allDBGadgets;
}