Make sure locale doesn't change after flush is called

Adapter/PhpcrOdmAdapter.php

@@ -71,9 +71,8 @@ public function getLocales($contentDocument)
     public function translateObject($contentDocument, $locale)
     {
         $meta = $this->dm->getMetadataFactory()->getMetadataFor(get_class($contentDocument));
-        $contentDocument = $this->dm->findTranslation($meta->getName(), $meta->getIdentifierValue($contentDocument), $locale);
 
-        return $contentDocument;
+        return $this->dm->findTranslation($meta->getName(), $meta->getIdentifierValue($contentDocument), $locale);
     }
 
     /**

Doctrine/Phpcr/AutoRouteListener.php

@@ -63,6 +63,7 @@ public function onFlush(ManagerEventArgs $args)
         $autoRoute = null;
         foreach ($updates as $document) {
             if ($this->isAutoRouteable($document)) {
+                $locale = $uow->getCurrentLocale($document);
 
                 $uriContextCollection = new UriContextCollection($document);
                 $arm->buildUriContextCollection($uriContextCollection);
@@ -73,6 +74,11 @@ public function onFlush(ManagerEventArgs $args)
                     $dm->persist($autoRoute);
                     $uow->computeChangeSets();
                 }
+
+                // reset locale to the original locale
+                if (null !== $locale) {
+                    $dm->findTranslation(get_class($document), $uow->getDocumentId($document), $locale);
+                }
             }
         }
 

Tests/Functional/EventListener/AutoRouteListenerTest.php

@@ -10,7 +10,7 @@
  */
 
 
-namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional\Subscriber;
+namespace Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional\EventListener;
 
 use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Functional\BaseTestCase;
 use Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Resources\Document\Blog;
@@ -229,7 +229,6 @@ public function testMultilangArticle($data, $expectedPaths)
         $this->getDm()->flush();
         $this->getDm()->clear();
 
-        $articleTitles = array_values($data);
         $locales = array_keys($data);
 
         foreach ($expectedPaths as $i => $expectedPath) {
@@ -271,6 +270,29 @@ public function provideUpdateMultilangArticle()
         );
     }
 
+    public function testMultilangArticleRemainsSameLocale()
+    {
+        $article = new Article;
+        $article->path = '/test/article-1';
+        $article->title = 'Good Day';
+        $this->getDm()->persist($article);
+        $this->getDm()->flush();
+
+        $article->title = 'Hello everybody!';
+        $this->getDm()->bindTranslation($article, 'en');
+
+        $article->title = 'Bonjour le monde!';
+        $this->getDm()->bindTranslation($article, 'fr');
+
+        // let current article be something else than the last bound locale
+        $this->getDm()->findTranslation(get_class($article), $this->getDm()->getUnitOfWork()->getDocumentId($article), 'en');
+
+        $this->getDm()->flush();
+        $this->getDm()->clear();
+
+        $this->assertEquals('Hello everybody!', $article->title);
+    }
+
     /**
      * @dataProvider provideUpdateMultilangArticle
      */

Tests/Resources/Document/Post.php

@@ -40,7 +40,7 @@ class Post
     public $blog;
 
     /**
-     * @PHPCR\NodeName()
+     * @PHPCR\Nodename()
      */
     public $name;