[project @ Return null from _negotiateAssociation]

1 files changed, 5 insertions, 0 deletions

diff --git a/Auth/OpenID/Consumer.php b/Auth/OpenID/Consumer.php
index bb515dd..1734685 100644
--- a/Auth/OpenID/Consumer.php
+++ b/Auth/OpenID/Consumer.php
@@ -1239,6 +1239,7 @@ class Auth_OpenID_GenericConsumer {
             ($assoc->getExpiresIn() <= 0)) {
 
             $assoc = $this->_negotiateAssociation($endpoint);
+
             if ($assoc !== null) {
                 $this->store->storeAssociation($endpoint->server_url,
                                                $assoc);
@@ -1256,6 +1257,10 @@ class Auth_OpenID_GenericConsumer {
         $assoc = $this->_requestAssociation(
                            $endpoint, $assoc_type, $session_type);
 
+        if (Auth_OpenID::isFailure($assoc)) {
+            return null;
+        }
+
         if (is_a($assoc, 'Auth_OpenID_ServerErrorContainer')) {
             $why = $assoc;