Merge pull request #176 from zfcampus/develop

Develop merge
zfcampus · Apr 27, 2015 · 2318beb · 2318beb
2 parents b5c79b2 + 20d2ecd
commit 2318beb
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/Server/Resource/DoctrineResourceFactory.php b/src/Server/Resource/DoctrineResourceFactory.php
@@ -213,7 +213,8 @@ protected function loadQueryCreateFilter(ServiceLocatorInterface $serviceLocator
         // Load the oAuth2 server
         $oAuth2Server = false;
         try {
-            $oAuth2Server = $serviceLocator->get('ZF\OAuth2\Service\OAuth2Server');
+            $oAuth2ServerFactory = $serviceLocator->get('ZF\OAuth2\Service\OAuth2Server');
+            $oAuth2Server = $oAuth2ServerFactory();
             $queryCreateFilter->setOAuth2Server($oAuth2Server);
         } catch (Exception $e) {
             // If no oAuth2 server that's just fine.
@@ -264,7 +265,8 @@ protected function loadQueryProviders(ServiceLocatorInterface $serviceLocator, $
         // Load the oAuth2 server
         $oAuth2Server = false;
         try {
-            $oAuth2Server = $serviceLocator->get('ZF\OAuth2\Service\OAuth2Server');
+            $oAuth2ServerFactory = $serviceLocator->get('ZF\OAuth2\Service\OAuth2Server');
+            $oAuth2Server = $oAuth2ServerFactory();
         } catch (Exception $e) {
             // If no oAuth2 server that's just fine.
         }