Author: Jonathan.Wage
Date: 2010-03-30 22:57:27 +0200 (Tue, 30 Mar 2010)
New Revision: 28902
Modified:
branches/1.3/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineDatabase.class.php
branches/1.4/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineDatabase.class.php
Log:
[1.3, 1.4] Fixing issue with properly shutting down sfDoctrineDatabase and
closing the Doctrine connection (closes #7081)
Modified:
branches/1.3/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineDatabase.class.php
===================================================================
---
branches/1.3/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineDatabase.class.php
2010-03-30 20:56:51 UTC (rev 28901)
+++
branches/1.3/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineDatabase.class.php
2010-03-30 20:57:27 UTC (rev 28902)
@@ -159,7 +159,10 @@
if ($this->connection !== null)
{
$this->connection = null;
- $this->_doctrineConnection = null;
}
+ if ($this->_doctrineConnection !== null)
+ {
+
$this->_doctrineConnection->getManager()->closeConnection($this->_doctrineConnection);
+ }
}
}
\ No newline at end of file
Modified:
branches/1.4/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineDatabase.class.php
===================================================================
---
branches/1.4/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineDatabase.class.php
2010-03-30 20:56:51 UTC (rev 28901)
+++
branches/1.4/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineDatabase.class.php
2010-03-30 20:57:27 UTC (rev 28902)
@@ -159,7 +159,10 @@
if ($this->connection !== null)
{
$this->connection = null;
- $this->_doctrineConnection = null;
}
+ if ($this->_doctrineConnection !== null)
+ {
+
$this->_doctrineConnection->getManager()->closeConnection($this->_doctrineConnection);
+ }
}
}
\ No newline at end of file
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
