db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t.@apache.org
Subject svn commit: r367086 - /db/torque/runtime/trunk/src/java/org/apache/torque/util/Criteria.java
Date Sun, 08 Jan 2006 20:16:16 GMT
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:mpoeschl@marmot.at">Martin Poeschl</a>
  * @author <a href="mailto:fischer@seitenbau.de">Thomas Fischer</a>
  * @author <a href="mailto:seade@backstagetech.com.au">Scott Eade</a>
+ * @author <a href="mailto:tv@apache.org">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: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org


Mime
View raw message