cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r589126 - /cayenne/main/tags/3.0M2/cayenne/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/DbLoader.java
Date Sat, 27 Oct 2007 14:56:50 GMT
Author: aadamchik
Date: Sat Oct 27 07:56:48 2007
New Revision: 589126

URL: http://svn.apache.org/viewvc?rev=589126&view=rev
Log:
fixing DbLoader bailing out of DbEntity loading too early

Modified:
    cayenne/main/tags/3.0M2/cayenne/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/DbLoader.java

Modified: cayenne/main/tags/3.0M2/cayenne/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/DbLoader.java
URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.0M2/cayenne/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/DbLoader.java?rev=589126&r1=589125&r2=589126&view=diff
==============================================================================
--- cayenne/main/tags/3.0M2/cayenne/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/DbLoader.java
(original)
+++ cayenne/main/tags/3.0M2/cayenne/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/DbLoader.java
Sat Oct 27 07:56:48 2007
@@ -315,7 +315,7 @@
             if (oldEnt != null) {
                 if (delegate == null) {
                     // no delegate, don't know what to do, cancel import
-                    return false;
+                    break;
                 }
 
                 try {
@@ -416,7 +416,7 @@
                 this.dbEntityList.add(dbEntity);
             }
         }
-
+        
         // get primary keys for each table and store it in dbEntity
         Iterator i = map.getDbEntities().iterator();
         while (i.hasNext()) {



Mime
View raw message