Changeset 2355

Timestamp:

03/26/10 15:08:47 (14 years ago)

Author:

pedroerp

Message:

Ticket #609 - Correção de errors introduzidos pela nova factory.

Location:

sandbox/workflow/branches/609/inc

Files:

• class.run_activity.inc.php (modified) (1 diff)
• engine/src/common/WfRuntime.php (modified) (1 diff)

sandbox/workflow/branches/609/inc/class.run_activity.inc.php

@@ -205 +205 @@
                 {
                         parent::WorkflowUtils();
-                        $this->runtime          = Factory::getInstance('workflow_wfruntime');
+
+                        /**
+                         * We should always use newInstance to instantiate
+                         * 'workflow_wfruntime'
+                         */
+                        $this->runtime                  = &Factory::newInstance('workflow_wfruntime');
                         $this->runtime->setDebug(_DEBUG);
                         //$this->base_activity  = Factory::getInstance('workflow_baseactivity');
                         //$this->process                = Factory::getInstance('workflow_process');
-                        $this->GUI              = Factory::getInstance('workflow_gui');
-                        $this->categories       = Factory::getInstance('categories');
-
-                        $this->workflowSmarty = Factory::getInstance('workflow_smarty', false);
+                        $this->GUI                              = &Factory::getInstance('workflow_gui');
+                        $this->categories               = &Factory::getInstance('categories');
+
+                        $this->workflowSmarty   = &Factory::getInstance('workflow_smarty', false);
                         // TODO: open a new connection to the database under a different username to allow privilege handling on tables
                         /* CELEPAR */

sandbox/workflow/branches/609/inc/engine/src/common/WfRuntime.php

@@ -272 +272 @@
       return false;
     }
-    $base_activity = &Factory::getInstance('BaseActivity', $this->db);
+    $base_activity = &Factory::newInstance('BaseActivity');
     $this->activity =& $base_activity->getActivity($activity_id, $with_roles, $with_agents);
     if (!$this->activity)