Return-Path: 
 <torque-dev-return-6265-apmail-db-torque-dev-archive=db.apache.org@db.apache.org>
Delivered-To: apmail-db-torque-dev-archive@www.apache.org
Received: (qmail 2633 invoked from network); 8 Jan 2006 20:16:39 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 8 Jan 2006 20:16:39 -0000
Received: (qmail 38177 invoked by uid 500); 8 Jan 2006 20:16:38 -0000
Delivered-To: apmail-db-torque-dev-archive@db.apache.org
Received: (qmail 38159 invoked by uid 500); 8 Jan 2006 20:16:38 -0000
Mailing-List: contact torque-dev-help@db.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:torque-dev-unsubscribe@db.apache.org>
List-Help: <mailto:torque-dev-help@db.apache.org>
List-Post: <mailto:torque-dev@db.apache.org>
List-Id: "Apache Torque Developers List" <torque-dev.db.apache.org>
Reply-To: "Apache Torque Developers List" <torque-dev@db.apache.org>
Delivered-To: mailing list torque-dev@db.apache.org
Received: (qmail 38147 invoked by uid 500); 8 Jan 2006 20:16:38 -0000
Received: (qmail 38142 invoked by uid 99); 8 Jan 2006 20:16:38 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 08 Jan 2006 12:16:38 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Sun, 08 Jan 2006 12:16:37 -0800
Received: (qmail 2549 invoked by uid 65534); 8 Jan 2006 20:16:17 -0000
Message-ID: <20060108201617.2544.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r367086 -
 /db/torque/runtime/trunk/src/java/org/apache/torque/util/Criteria.java
Date: Sun, 08 Jan 2006 20:16:16 -0000
To: torque-commits@db.apache.org
From: tv@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

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