You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by an...@apache.org on 2009/12/29 12:27:08 UTC

svn commit: r894357 - in /cayenne/main/trunk: docs/doc/src/main/resources/RELEASE-NOTES.txt framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java

Author: andrey
Date: Tue Dec 29 11:27:07 2009
New Revision: 894357

URL: http://svn.apache.org/viewvc?rev=894357&view=rev
Log:
CAY-1351 EntityResolver.getEmbeddable(...) always returns null

Modified:
    cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java

Modified: cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt?rev=894357&r1=894356&r2=894357&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt Tue Dec 29 11:27:07 2009
@@ -39,6 +39,9 @@
 
 CAY-1326 Document Cayenne Embeddables Feature
 
+Bug Fixes Since 3.0RC1:
+CAY-1351 EntityResolver.getEmbeddable(...) always returns null
+
 ----------------------------------
 Release: 3.0 RC 1
 Date: 

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java?rev=894357&r1=894356&r2=894357&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java Tue Dec 29 11:27:07 2009
@@ -565,6 +565,9 @@
             for (Procedure proc : map.getProcedures()) {
                 procedureCache.put(proc.getName(), proc);
             }
+            
+            // index embeddables
+            embeddableCache.putAll(map.getEmbeddableMap());
 
             // index queries
             for (Query query : map.getQueries()) {