svn commit: r1295465 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomain.java

[aadamchik]

Author: aadamchik
Date: Thu Mar  1 08:26:39 2012
New Revision: 1295465

URL: http://svn.apache.org/viewvc?rev=1295465&view=rev
Log:
CAY-1680 Get rid of shared locks in DataDomain metadata lookups

Modified:
    
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomain.java

Modified: 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomain.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomain.java?rev=1295465&r1=1295464&r2=1295465&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomain.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomain.java
 Thu Mar  1 08:26:39 2012
@@ -429,7 +429,7 @@ public class DataDomain implements Query
      * 
      * @since 3.1
      */
-    public synchronized void removeDataMap(String mapName) {
+    public void removeDataMap(String mapName) {
         DataMap map = getDataMap(mapName);
         if (map == null) {
             return;
@@ -440,11 +440,11 @@ public class DataDomain implements Query
             node.removeDataMap(mapName);
         }
 
+        nodesByDataMapName.remove(mapName);
+
         // remove from EntityResolver
         getEntityResolver().removeDataMap(map);
 
-        // reindex nodes to remove references on removed map entities
-        reindexNodes();
         refreshEntitySorter();
     }