Author: tv
Date: Sun Jan 8 12:16:12 2006
New Revision: 367086
URL: http://svn.apache.org/viewcvs?rev=367086&view=rev
Log:
Rolled back the changes in readObject() because of
serialization errors in JDK 1.4.
Modified:
db/torque/runtime/trunk/src/java/org/apache/torque/util/Criteria.java
Modified: db/torque/runtime/trunk/src/java/org/apache/torque/util/Criteria.java
URL:
http://svn.apache.org/viewcvs/db/torque/runtime/trunk/src/java/org/apache/torque/util/Criteria.java?rev=367086&r1=367085&r2=367086&view=diff
==============================================================================
--- db/torque/runtime/trunk/src/java/org/apache/torque/util/Criteria.java
(original)
+++ db/torque/runtime/trunk/src/java/org/apache/torque/util/Criteria.java Sun
Jan 8 12:16:12 2006
@@ -60,6 +60,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Martin Poeschl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Thomas Fischer</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Scott Eade</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Thomas Vandahl</a>
* @version $Id$
*/
public class Criteria extends Hashtable
@@ -3090,13 +3091,13 @@
// Criteria.put() differs somewhat from Hashtable.put().
// This necessitates some corrective behavior upon deserialization.
- for (Iterator iter = entrySet().iterator(); iter.hasNext();)
+ for (Iterator iter = keySet().iterator(); iter.hasNext();)
{
- Map.Entry entry = (Map.Entry)iter.next();
- Object value = entry.getValue();
+ Object key = iter.next();
+ Object value = get(key);
if (value instanceof Criteria.Criterion)
{
- super.put(entry.getKey(), value);
+ super.put(key, value);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
