jon 01/10/14 12:40:39
Modified: src/java/org/apache/torque/util BasePeer.java
Log:
duh. i'm an idiot. i needs to be static
cleaned up some code formatting
Revision Changes Path
1.11 +24 -14
jakarta-turbine-torque/src/java/org/apache/torque/util/BasePeer.java
Index: BasePeer.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/util/BasePeer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- BasePeer.java 2001/10/14 19:36:50 1.10
+++ BasePeer.java 2001/10/14 19:40:39 1.11
@@ -110,7 +110,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
- * @version $Id: BasePeer.java,v 1.10 2001/10/14 19:36:50 jon Exp $
+ * @version $Id: BasePeer.java,v 1.11 2001/10/14 19:40:39 jon Exp $
*/
public abstract class BasePeer implements java.io.Serializable
{
@@ -806,7 +806,7 @@
{
tds = new TableDataSet(dbCon.getConnection(), tableName );
Record rec = tds.addRecord();
- insertOrUpdateRecord(rec, tableName, criteria);
+ BasePeer.insertOrUpdateRecord(rec, tableName, criteria);
}
finally
{
@@ -841,7 +841,7 @@
* @param criteria A Criteria.
* @exception Exception, a generic exception.
*/
- private void insertOrUpdateRecord(Record rec,
+ private static void insertOrUpdateRecord(Record rec,
String tableName,
Criteria criteria)
throws Exception
@@ -1650,10 +1650,13 @@
{
// Get a connection to the db.
if (doTransaction)
+ {
db = beginTransaction(selectCriteria.getDbName());
+ }
else
+ {
db = Torque.getConnection( selectCriteria.getDbName() );
-
+ }
doUpdate(selectCriteria, updateValues, db);
}
finally
@@ -1759,12 +1762,16 @@
for (int j=0; j<tds.size(); j++)
{
Record rec = tds.getRecord(j);
- insertOrUpdateRecord(rec, tables.get(i), updateValues);
+ BasePeer
+ .insertOrUpdateRecord(rec, tables.get(i), updateValues);
}
}
finally
{
- if (tds != null) tds.close();
+ if (tds != null)
+ {
+ tds.close();
+ }
}
}
}
@@ -1839,7 +1846,10 @@
}
finally
{
- if (statement != null) statement.close();
+ if (statement != null)
+ {
+ statement.close();
+ }
}
return rowCount;
}
@@ -1904,14 +1914,14 @@
{
synchronized(mapBuilders)
{
- mb = (MapBuilder)mapBuilders.get(name);
- if (mb == null)
- {
- mb = (MapBuilder)Class.forName(name).newInstance();
- // Cache the MapBuilder before it is built.
- mapBuilders.put(name, mb);
- }
- }
+ mb = (MapBuilder)mapBuilders.get(name);
+ if (mb == null)
+ {
+ mb = (MapBuilder)Class.forName(name).newInstance();
+ // Cache the MapBuilder before it is built.
+ mapBuilders.put(name, mb);
+ }
+ }
}
// Build the MapBuilder in its own synchronized block to
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
