You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by fr...@apache.org on 2006/08/31 19:19:25 UTC

svn commit: r438988 - /incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java

Author: frankb
Date: Thu Aug 31 10:19:24 2006
New Revision: 438988

URL: http://svn.apache.org/viewvc?rev=438988&view=rev
Log:
Possible fix for TUSCANY-682

Modified:
    incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java

Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java?rev=438988&r1=438987&r2=438988&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java Thu Aug 31 10:19:24 2006
@@ -163,24 +163,21 @@
   }
 
   private void initAliasNames() {
-    if (propertyNameToPropertyMap == null) //FB use eNameToFeatureMap for this?
+    Map result = new HashMap();
+    for (Iterator i = getProperties().iterator(); i.hasNext();)
     {
-      Map result = new HashMap();
-      for (Iterator i = getProperties().iterator(); i.hasNext(); )
-      {
-        Property property = (Property)i.next();
-        result.put(property.getName(), property);
+      Property property = (Property)i.next();
+      result.put(property.getName(), property);
 
-        List aliasNames = property.getAliasNames();
-        for (int count = aliasNames.size(); count > 0; )
-        {
-          result.put(aliasNames.get(--count), property);
-        }
+      List aliasNames = property.getAliasNames();
+      for (int count = aliasNames.size(); count > 0;)
+      {
+        result.put(aliasNames.get(--count), property);
       }
-      propertyNameToPropertyMap = result;
     }
+    propertyNameToPropertyMap = result;
   }
-  
+
   /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
@@ -188,10 +185,9 @@
    */
   public Property getProperty(String propertyName)
   {
-    initAliasNames();
+    if (propertyNameToPropertyMap == null) initAliasNames();
     Property property = (Property)propertyNameToPropertyMap.get(propertyName);
     if (property == null && !isOpen()) {
-      propertyNameToPropertyMap = null;
       initAliasNames();
       property = (Property)propertyNameToPropertyMap.get(propertyName);
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org