mpoeschl 2003/08/22 05:58:43
Modified: src/java/org/apache/turbine/om/security/peer RolePeer.java
PermissionPeer.java GroupPeer.java
TurbineUserPeer.java
Log:
remove unnecessary casts and criteria.setBlobFlag() calls
Revision Changes Path
1.11 +2 -2
jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/RolePeer.java
Index: RolePeer.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/RolePeer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- RolePeer.java 27 Jun 2003 21:53:23 -0000 1.10
+++ RolePeer.java 22 Aug 2003 12:58:43 -0000 1.11
@@ -184,7 +184,7 @@
((TurbineRole) obj).setPrimaryKey(
new NumberKey(row.getValue(1).asInt()));
((TurbineRole) obj).setName(row.getValue(2).asString());
- byte[] objectData = (byte[]) row.getValue(3).asBytes();
+ byte[] objectData = row.getValue(3).asBytes();
Map temp = (Map) ObjectUtils.deserialize(objectData);
if (temp != null)
{
1.11 +2 -2
jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/PermissionPeer.java
Index: PermissionPeer.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/PermissionPeer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PermissionPeer.java 27 Jun 2003 21:56:18 -0000 1.10
+++ PermissionPeer.java 22 Aug 2003 12:58:43 -0000 1.11
@@ -188,7 +188,7 @@
((SecurityObject) obj).setPrimaryKey(
new NumberKey(row.getValue(1).asInt()));
((SecurityObject) obj).setName(row.getValue(2).asString());
- byte[] objectData = (byte[]) row.getValue(3).asBytes();
+ byte[] objectData = row.getValue(3).asBytes();
Map temp = (Map) ObjectUtils.deserialize(objectData);
if (temp != null)
{
1.11 +2 -2
jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/GroupPeer.java
Index: GroupPeer.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/GroupPeer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- GroupPeer.java 27 Jun 2003 21:56:18 -0000 1.10
+++ GroupPeer.java 22 Aug 2003 12:58:43 -0000 1.11
@@ -174,7 +174,7 @@
((SecurityObject) obj).setPrimaryKey(
new NumberKey(row.getValue(1).asInt()));
((SecurityObject) obj).setName(row.getValue(2).asString());
- byte[] objectData = (byte[]) row.getValue(3).asBytes();
+ byte[] objectData = row.getValue(3).asBytes();
Map temp = (Map) ObjectUtils.deserialize(objectData);
if (temp != null)
{
1.13 +2 -9
jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/TurbineUserPeer.java
Index: TurbineUserPeer.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/security/peer/TurbineUserPeer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TurbineUserPeer.java 27 Jun 2003 21:53:23 -0000 1.12
+++ TurbineUserPeer.java 22 Aug 2003 12:58:43 -0000 1.13
@@ -282,8 +282,7 @@
// Restore the Permanent Storage Hashtable. First the
// Hashtable is restored, then any explicit table columns
// which should be included in the Hashtable are added.
- byte[] objectData = (byte[])
- row.getValue(objectDataPosition).asBytes();
+ byte[] objectData = row.getValue(objectDataPosition).asBytes();
Hashtable tempHash = (Hashtable)
ObjectUtils.deserialize(objectData);
if (tempHash == null)
@@ -395,9 +394,6 @@
public static List doSelect(Criteria criteria, User current)
throws TorqueException
{
- // stuff for postgresql problem.....
- criteria.setBlobFlag(true);
-
// add User table columns
addSelectColumns(criteria);
@@ -451,9 +447,6 @@
public static List doSelect(Criteria criteria, Connection dbConn)
throws TorqueException
{
- // stuff for postgresql problem.....
- criteria.setBlobFlag(true);
-
// add User table columns
addSelectColumns(criteria);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
