[xc-tokai-svnlog] SF.net SVN: xc-tokai:[529] tools_Tubson/trunk/cubson/Generator/Project/ AssetManagerGenerator.cs

[<mum...@us...>]

Revision: 529
          http://xc-tokai.svn.sourceforge.net/xc-tokai/?rev=529&view=rev
Author:   mumincacao
Date:     2011-03-03 10:50:45 +0000 (Thu, 03 Mar 2011)

Log Message:
-----------
Fixed Bug: Asset manager cannot handling multiple action form.

Modified Paths:
--------------
    tools_Tubson/trunk/cubson/Generator/Project/AssetManagerGenerator.cs

Modified: tools_Tubson/trunk/cubson/Generator/Project/AssetManagerGenerator.cs
===================================================================
--- tools_Tubson/trunk/cubson/Generator/Project/AssetManagerGenerator.cs	2011-03-03 10:40:15 UTC (rev 528)
+++ tools_Tubson/trunk/cubson/Generator/Project/AssetManagerGenerator.cs	2011-03-03 10:50:45 UTC (rev 529)
@@ -104,9 +104,10 @@
             param[3].defaultValue = "null";
             
             MethodTemplate getObject = new MethodTemplate(AccessLevel.PUBLIC, true, "getObject", param, "&object<XCube_ActionFilter,XCube_ActionForm,XoopsObjectGenericHandler>");
-            getObject.AppendCode("if(isset($this->_mCache[$type][$name]))");
+            getObject.AppendCode("$key = md5(serialize(array($name,$isAdmin,$mode)));");
+            getObject.AppendCode("if(isset($this->_mCache[$type][$key]))");
             getObject.AppendCode("{");
-            getObject.AppendCode("    return $this->_mCache[$type][$name];");
+            getObject.AppendCode("    return $this->_mCache[$type][$key];");
             getObject.AppendCode("}");
             getObject.AppendBreak();
             getObject.AppendCode("$instance = null;");
@@ -122,7 +123,7 @@
             getObject.AppendCode("    $instance =& $this->_fallbackCreate($type,$name,$isAdmin,$mode);");
             getObject.AppendCode("}");
             getObject.AppendBreak();
-            getObject.AppendCode("$this->_mCache[$type][$name] =& $instance;");
+            getObject.AppendCode("$this->_mCache[$type][$key] =& $instance;");
             getObject.AppendBreak();
             getObject.AppendCode("return $instance;");
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.