Update of /var/cvs/src/org/mmbase/storage/implementation/database
In directory james.mmbase.org:/tmp/cvs-serv11729
Modified Files:
DatabaseStorageManager.java
RelationalDatabaseStorageManager.java
ViewDatabaseStorageManager.java
Log Message:
removed silly and now unused return types again
See also:
http://cvs.mmbase.org/viewcvs/src/org/mmbase/storage/implementation/database
Index: DatabaseStorageManager.java
===================================================================
RCS file:
/var/cvs/src/org/mmbase/storage/implementation/database/DatabaseStorageManager.java,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -b -r1.200 -r1.201
--- DatabaseStorageManager.java 9 Oct 2008 09:46:24 -0000 1.200
+++ DatabaseStorageManager.java 9 Oct 2008 09:51:42 -0000 1.201
@@ -32,7 +32,7 @@
*
* @author Pierre van Rooden
* @since MMBase-1.7
- * @version $Id: DatabaseStorageManager.java,v 1.200 2008/10/09 09:46:24
michiel Exp $
+ * @version $Id: DatabaseStorageManager.java,v 1.201 2008/10/09 09:51:42
michiel Exp $
*/
public class DatabaseStorageManager implements StorageManager {
@@ -1027,9 +1027,9 @@
* @throws SQLException If something wrong with the query, or the database
is down or could not be contacted.
* @since MMBase-1.7.1
*/
- protected int executeUpdateCheckConnection(String query, MMObjectNode
node, List<CoreField> fields) throws SQLException {
+ protected void executeUpdateCheckConnection(String query, MMObjectNode
node, List<CoreField> fields) throws SQLException {
try {
- return executeUpdate(query, node, fields);
+ executeUpdate(query, node, fields);
} catch (SQLException sqe) {
while (true) {
Statement s = null;
@@ -1057,7 +1057,7 @@
}
break;
}
- return executeUpdate(query, node, fields);
+ executeUpdate(query, node, fields);
}
}
@@ -1070,11 +1070,10 @@
* @param fields updated fields
* @throws SQLException if database connections failures occurs
* @return The result of [EMAIL PROTECTED]
PreparedStatement#executeUpdate}. That would normally be
- * <code>1</code>, but <code>0</code> when updating a not that does not
exists any more.
*
* @since MMBase-1.7.1
*/
- protected int executeUpdate(String query, MMObjectNode node,
List<CoreField> fields) throws SQLException {
+ protected void executeUpdate(String query, MMObjectNode node,
List<CoreField> fields) throws SQLException {
PreparedStatement ps = activeConnection.prepareStatement(query);
for (int fieldNumber = 0; fieldNumber < fields.size(); fieldNumber++) {
CoreField field = fields.get(fieldNumber);
@@ -1087,10 +1086,9 @@
}
}
long startTime = getLogStartTime();
- int result = ps.executeUpdate();
+ ps.executeUpdate();
ps.close();
logQuery(query, startTime);
- return result;
}
@@ -1136,7 +1134,7 @@
* @param builder the builder to store the node
* @throws StorageException if an error occurred during change
*/
- protected int change(MMObjectNode node, MMObjectBuilder builder) throws
StorageException {
+ protected void change(MMObjectNode node, MMObjectBuilder builder) throws
StorageException {
List<CoreField> changeFields = new ArrayList<CoreField>();
// obtain the node's changed fields
Collection<String> fieldNames = node.getChanged();
@@ -1149,14 +1147,14 @@
}
}
String tablename = (String) factory.getStorageIdentifier(builder);
- return change(node, builder, tablename, changeFields);
+ change(node, builder, tablename, changeFields);
}
/**
* Commits changes in node to table.
*/
- protected int change(MMObjectNode node, MMObjectBuilder builder, String
tableName, Collection<CoreField> changeFields) {
+ protected void change(MMObjectNode node, MMObjectBuilder builder, String
tableName, Collection<CoreField> changeFields) {
// Create a String that represents the fields to be used in the commit
StringBuilder setFields = null;
List<CoreField> fields = new ArrayList<CoreField>();
@@ -1188,14 +1186,12 @@
try {
String query = scheme.format(this, tableName ,
setFields.toString(), builder.getField("number"), node);
getActiveConnection();
- return executeUpdateCheckConnection(query, node, fields);
+ executeUpdateCheckConnection(query, node, fields);
} catch (SQLException se) {
throw new StorageException(se.getMessage() + " for node " +
node, se);
} finally {
releaseActiveConnection();
}
- } else {
- return 0;
}
}
Index: RelationalDatabaseStorageManager.java
===================================================================
RCS file:
/var/cvs/src/org/mmbase/storage/implementation/database/RelationalDatabaseStorageManager.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- RelationalDatabaseStorageManager.java 23 Jul 2008 05:12:09 -0000
1.13
+++ RelationalDatabaseStorageManager.java 9 Oct 2008 09:51:42 -0000
1.14
@@ -22,7 +22,7 @@
*
* @author Pierre van Rooden
* @since MMBase-1.7
- * @version $Id: RelationalDatabaseStorageManager.java,v 1.13 2008/07/23
05:12:09 michiel Exp $
+ * @version $Id: RelationalDatabaseStorageManager.java,v 1.14 2008/10/09
09:51:42 michiel Exp $
*/
public class RelationalDatabaseStorageManager extends DatabaseStorageManager {
@@ -76,19 +76,17 @@
* @param builder the builder to change the node in
* @throws StorageException if an error occurred during change
*/
- public int change(MMObjectNode node, MMObjectBuilder builder) throws
StorageException {
+ public void change(MMObjectNode node, MMObjectBuilder builder) throws
StorageException {
boolean localTransaction = !inTransaction;
if (localTransaction) {
beginTransaction();
}
try {
- int res = 0;
do {
- res = super.change(node, builder);
+ super.change(node, builder);
builder = builder.getParentBuilder();
} while (builder != null);
if (localTransaction) commit();
- return res;
} catch (StorageException se) {
if (localTransaction && inTransaction) rollback();
throw se;
Index: ViewDatabaseStorageManager.java
===================================================================
RCS file:
/var/cvs/src/org/mmbase/storage/implementation/database/ViewDatabaseStorageManager.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- ViewDatabaseStorageManager.java 23 Jul 2008 05:12:09 -0000 1.12
+++ ViewDatabaseStorageManager.java 9 Oct 2008 09:51:42 -0000 1.13
@@ -27,7 +27,7 @@
/**
* @javadoc
*
- * @version $Id: ViewDatabaseStorageManager.java,v 1.12 2008/07/23 05:12:09
michiel Exp $
+ * @version $Id: ViewDatabaseStorageManager.java,v 1.13 2008/10/09 09:51:42
michiel Exp $
* @since MMBase-1.8
*/
public class ViewDatabaseStorageManager extends DatabaseStorageManager {
@@ -130,32 +130,30 @@
* @param builder the builder to change the node in
* @throws StorageException if an error occurred during change
*/
- public int change(MMObjectNode node, MMObjectBuilder builder) throws
StorageException {
+ public void change(MMObjectNode node, MMObjectBuilder builder) throws
StorageException {
boolean localTransaction = !inTransaction;
if (localTransaction) {
beginTransaction();
}
try {
- int res = 0;
if (factory.hasOption("database-supports-update-triggers")) {
- res = super.change(node, builder);
+ super.change(node, builder);
} else {
do {
- res = changeObject(node,builder);
+ changeObject(node,builder);
builder = builder.getParentBuilder();
} while (builder!=null);
}
if (localTransaction) {
commit();
}
- return res;
} catch (StorageException se) {
if (localTransaction && inTransaction) rollback();
throw se;
}
}
- private int changeObject(MMObjectNode node, MMObjectBuilder builder) {
+ private void changeObject(MMObjectNode node, MMObjectBuilder builder) {
List<CoreField> changeFields = new ArrayList<CoreField>();
// obtain the node's changed fields
Collection<String> fieldNames = node.getChanged();
@@ -165,7 +163,7 @@
changeFields.add(field);
}
}
- return change(node, builder, getTableName(builder), changeFields);
+ change(node, builder, getTableName(builder), changeFields);
}
/**
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
