You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2006/10/13 21:01:45 UTC

svn commit: r463777 - in /incubator/cayenne/main/branches/STABLE-2.0/cayenne: cayenne-java/src/modeler/java/org/apache/cayenne/modeler/dialog/datamap/SchemaUpdateController.java cayenne-other/release-notes/RELEASE-NOTES-2.0-incubating-SNAPSHOT.txt

Author: aadamchik
Date: Fri Oct 13 12:01:44 2006
New Revision: 463777

URL: http://svn.apache.org/viewvc?view=rev&rev=463777
Log:
CAY-690 Exception in the Modeler when changing schema on derived entities (2.0 branch)

Modified:
    incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/dialog/datamap/SchemaUpdateController.java
    incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/release-notes/RELEASE-NOTES-2.0-incubating-SNAPSHOT.txt

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/dialog/datamap/SchemaUpdateController.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/dialog/datamap/SchemaUpdateController.java?view=diff&rev=463777&r1=463776&r2=463777
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/dialog/datamap/SchemaUpdateController.java (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/dialog/datamap/SchemaUpdateController.java Fri Oct 13 12:01:44 2006
@@ -23,6 +23,7 @@
 
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.DbEntity;
+import org.apache.cayenne.map.DerivedDbEntity;
 import org.apache.cayenne.map.Procedure;
 import org.apache.cayenne.map.event.EntityEvent;
 import org.apache.cayenne.map.event.ProcedureEvent;
@@ -73,6 +74,11 @@
         Iterator dbEntities = dataMap.getDbEntities().iterator();
         while (dbEntities.hasNext()) {
             DbEntity entity = (DbEntity) dbEntities.next();
+            
+            if(entity instanceof DerivedDbEntity) {
+                continue;
+            }
+            
             if (doAll || Util.isEmptyString(entity.getSchema())) {
                 if (!Util.nullSafeEquals(defaultSchema, entity.getSchema())) {
                     entity.setSchema(defaultSchema);

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/release-notes/RELEASE-NOTES-2.0-incubating-SNAPSHOT.txt
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/release-notes/RELEASE-NOTES-2.0-incubating-SNAPSHOT.txt?view=diff&rev=463777&r1=463776&r2=463777
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/release-notes/RELEASE-NOTES-2.0-incubating-SNAPSHOT.txt (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/release-notes/RELEASE-NOTES-2.0-incubating-SNAPSHOT.txt Fri Oct 13 12:01:44 2006
@@ -7,10 +7,22 @@
 To browse individual bug reports check out project issue tracker:
 http://issues.apache.org/cayenne/
 
+----------------------------------
+Release: 2.0.2-incubating
+Date: 
+----------------------------------
+
+Bug Fixes:
+
+CAY-565 LRUMap NPE
+CAY-652 Exception with Tomcat's session restore capability
+CAY-653 overriding setPersistentState() in unreliable in three tier environment with CayenneContext
+CAY-690 Exception in the Modeler when changing schema on derived entities
+
 
 ----------------------------------
-Release: 2.0-incubating-SNAPSHOT
-Date:
+Release: 2.0.1-incubating
+Date: 10/7/2006
 ----------------------------------
 
 Bug Fixes:
@@ -25,4 +37,4 @@
  CAY-609	Modeler prevents intermediate prefetch creation
  
 Changes: 
- CAY-623  Removing broken FireBird adapter
\ No newline at end of file
+ CAY-623  Removing broken FireBird adapter