You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2001/03/29 18:43:19 UTC
cvs commit: jakarta-turbine/src/java/org/apache/turbine/om/security/peer TurbineUserPeer.java
jvanzyl 01/03/29 08:43:19
Modified: src/java/org/apache/turbine/om/peer BasePeer.java
src/java/org/apache/turbine/om/security/peer
TurbineUserPeer.java
Log:
- applying patches sent by Jeff Brekke.
Revision Changes Path
1.46 +4 -11 jakarta-turbine/src/java/org/apache/turbine/om/peer/BasePeer.java
Index: BasePeer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/om/peer/BasePeer.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- BasePeer.java 2001/03/14 00:05:51 1.45
+++ BasePeer.java 2001/03/29 16:43:19 1.46
@@ -84,7 +84,7 @@
* @author <a href="mailto:frank.kim@clearink.com">Frank Y. Kim</a>
* @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
* @author <a href="mailto:bmclaugh@algx.net">Brett McLaughlin</a>
- * @version $Id: BasePeer.java,v 1.45 2001/03/14 00:05:51 dlr Exp $
+ * @version $Id: BasePeer.java,v 1.46 2001/03/29 16:43:19 jvanzyl Exp $
*/
public abstract class BasePeer
{
@@ -100,9 +100,6 @@
/** Classes that implement this class should override this value. */
public static final String TABLE_NAME = "TABLE_NAME";
- /** Are we in DEBUG mode? */
- private static final boolean DEBUG = false;
-
/** The Turbine default MapBuilder. */
public static final String DEFAULT_MAP_BUILDER =
"org.apache.turbine.util.db.map.TurbineMapBuilder";
@@ -558,9 +555,7 @@
try
{
tds = new TableDataSet(connection, tables.get(i), kd );
- if (DEBUG)
- System.out.println("BasePeer.doDelete whereClause = " +
- whereClause.toString(" AND ") );
+ Log.debug("BasePeer.doDelete whereClause = " + whereClause.toString(" AND ") );
tds.where( whereClause.toString(" AND ") );
tds.fetchRecords();
if ( tds.size() > 1 && criteria.isSingleRecord() )
@@ -1060,9 +1055,7 @@
if (limitString != null) querySql.setLimit(limitString);
- if (DEBUG) Log.info("BasePeer.querySql= "+ querySql.toString());
- if (DEBUG) System.out.println("BasePeer.querySql= "+
- querySql.toString());
+ Log.debug("BasePeer.querySql= "+ querySql.toString());
return querySql.toString();
}
@@ -1633,7 +1626,7 @@
// Get affected records.
tds = new TableDataSet(connection, tables.get(i), kd );
tds.where( whereClause.toString(" AND " ) );
- if (DEBUG) System.out.println("Update (select) whereClause=" + whereClause.toString(" AND ") );
+ Log.debug("Update (select) whereClause=" + whereClause.toString(" AND ") );
tds.fetchRecords();
if ( tds.size() > 1 && selectCriteria.isSingleRecord() )
1.14 +2 -2 jakarta-turbine/src/java/org/apache/turbine/om/security/peer/TurbineUserPeer.java
Index: TurbineUserPeer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/om/security/peer/TurbineUserPeer.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TurbineUserPeer.java 2001/03/23 11:15:12 1.13
+++ TurbineUserPeer.java 2001/03/29 16:43:19 1.14
@@ -80,7 +80,7 @@
* @author <a href="mailto:frank.kim@clearink.com">Frank Y. Kim</a>
* @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
* @author <a href="mailto:bmclaugh@algx.net">Brett McLaughlin</a>
- * @version $Id: TurbineUserPeer.java,v 1.13 2001/03/23 11:15:12 rafal Exp $
+ * @version $Id: TurbineUserPeer.java,v 1.14 2001/03/29 16:43:19 jvanzyl Exp $
*/
public class TurbineUserPeer extends BasePeer implements UserPeer
{
@@ -307,7 +307,7 @@
Record row = (Record)rows.elementAt(i);
// FIXME!! use ObjectKey
- ((BaseObject)obj).setPrimaryKey( row.getValue(idPosition).asString() );
+ ((BaseObject)obj).setPrimaryKey( new NumberKey(row.getValue(idPosition).asBigDecimal()) );
// Restore the Permanent Storage Hashtable. First the
// Hashtable is restored, then any explicit table columns
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org