MONDRIAN: change default for mondrian.rolap.RolapMember.PropertyValue…

…Map.class to java.util.HashMap rather than Flat3Map, since the latter isn't supported in version 2.1 of commons-collections [git-p4: depot-paths = "//open/mondrian/": change = 12930]
pentaho · Jul 10, 2009 · 300bf76 · 300bf76
1 parent 58587ed
commit 300bf76
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/doc/configuration.html b/doc/configuration.html
@@ -1111,7 +1111,7 @@ <h3>1.1 Property list<a name="Property_list">&nbsp;</a></h3>
       <td>
       If set, the specified class is used to store member property
       values in mondrian.rolap.RolapMember.  Defaults to
-      org.apache.commons.collections.map.Flat3Map
+      java.util.HashMap
       </td>
     </tr>
     <tr>

diff --git a/src/main/mondrian/rolap/RolapMember.java b/src/main/mondrian/rolap/RolapMember.java
@@ -18,7 +18,6 @@
 import mondrian.util.CreationException;
 
 import org.apache.log4j.Logger;
-import org.apache.commons.collections.map.Flat3Map;
 import org.eigenbase.util.property.StringProperty;
 
 import java.util.*;
@@ -866,7 +865,10 @@ protected Map getDefault(
             Object[] parameterValues)
             throws CreationException
         {
-            return new Flat3Map();
+            // REVIEW emcdermid 10-Jul-2009: Would almost certainly be more
+            // efficient to use Flat3Map from Apache commons collection, but
+            // that requires Mondrian upgrade to a newer version.
+            return new HashMap();
         }
     }
 }