From 265cdaf2a60d61fe43fe5e5ff72695abcc873d3e Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Tue, 2 Nov 2010 20:18:22 +0000
Subject: [PATCH] SEC-1595: Added extra constructor to OpenID4JavaConsumer
 which takes a ConsumerManager to allow a version compatible with GAE to be
 injected.

---
 .../security/openid/OpenID4JavaConsumer.java           | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java b/openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java
index e9b4f80096..1a803af100 100644
--- a/openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java
+++ b/openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java
@@ -57,8 +57,7 @@ public class OpenID4JavaConsumer implements OpenIDConsumer {
     //~ Constructors ===================================================================================================
 
     public OpenID4JavaConsumer() throws ConsumerException {
-        this.consumerManager = new ConsumerManager();
-        this.attributesToFetchFactory = new NullAxFetchListFactory();
+        this(new ConsumerManager(), new NullAxFetchListFactory());
     }
 
     /**
@@ -83,7 +82,12 @@ public class OpenID4JavaConsumer implements OpenIDConsumer {
     }
 
     public OpenID4JavaConsumer(AxFetchListFactory attributesToFetchFactory) throws ConsumerException {
-        this.consumerManager = new ConsumerManager();
+        this(new ConsumerManager(), attributesToFetchFactory);
+    }
+
+    public OpenID4JavaConsumer(ConsumerManager consumerManager, AxFetchListFactory attributesToFetchFactory)
+            throws ConsumerException {
+        this.consumerManager = consumerManager;
         this.attributesToFetchFactory = attributesToFetchFactory;
     }