From ec166e086b04992e13cc17a33f712fd233f4ae93 Mon Sep 17 00:00:00 2001
From: Ben Alex <ben.alex@springsource.com>
Date: Wed, 1 Sep 2004 21:19:05 +0000
Subject: [PATCH] Refactored UsernamePasswordAuthenticationToken.getDetails()
 to Object.

---
 changelog.txt                                  |  1 +
 .../UsernamePasswordAuthenticationToken.java   | 18 +++++++++---------
 .../dao/DaoAuthenticationProvider.java         |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 911ea1bb9c..23fc24d265 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -8,6 +8,7 @@ Changes in version 0.x (2004-xx-xx)
 * Added FilterToBeanProxy compatibility with ContextLoaderServlet (lazy inits)
 * Extracted removeUserFromCache(String) to UserCache interface
 * Improved ConfigAttributeEditor so it trims preceding and trailing spaces
+* Refactored UsernamePasswordAuthenticationToken.getDetails() to Object
 * Fixed EH-CACHE-based caching implementation behaviour when cache exists
 * Fixed Ant "release" target not including project.properties
 * Fixed GrantedAuthorityEffectiveAclsResolver if null ACLs provided to method
diff --git a/core/src/main/java/org/acegisecurity/providers/UsernamePasswordAuthenticationToken.java b/core/src/main/java/org/acegisecurity/providers/UsernamePasswordAuthenticationToken.java
index 78b9874e40..ca7b6edf94 100644
--- a/core/src/main/java/org/acegisecurity/providers/UsernamePasswordAuthenticationToken.java
+++ b/core/src/main/java/org/acegisecurity/providers/UsernamePasswordAuthenticationToken.java
@@ -37,10 +37,10 @@ public class UsernamePasswordAuthenticationToken
     //~ Instance fields ========================================================
 
     private Object credentials;
+    private Object details = null;
     private Object principal;
     private GrantedAuthority[] authorities;
     private boolean authenticated = false;
-    private String details = null;
 
     //~ Constructors ===========================================================
 
@@ -83,15 +83,15 @@ public class UsernamePasswordAuthenticationToken
         return this.credentials;
     }
 
+    public void setDetails(Object details) {
+        this.details = details;
+    }
+
+    public Object getDetails() {
+        return details;
+    }
+
     public Object getPrincipal() {
         return this.principal;
     }
-
-	public Object getDetails() {
-		return details;
-	}
-
-	public void setDetails(String details) {
-		this.details = details;
-	}
 }
diff --git a/core/src/main/java/org/acegisecurity/providers/dao/DaoAuthenticationProvider.java b/core/src/main/java/org/acegisecurity/providers/dao/DaoAuthenticationProvider.java
index 83e460cc5f..929b1cf7ce 100644
--- a/core/src/main/java/org/acegisecurity/providers/dao/DaoAuthenticationProvider.java
+++ b/core/src/main/java/org/acegisecurity/providers/dao/DaoAuthenticationProvider.java
@@ -349,7 +349,7 @@ public class DaoAuthenticationProvider implements AuthenticationProvider,
         UsernamePasswordAuthenticationToken result = new UsernamePasswordAuthenticationToken(principal,
                 authentication.getCredentials(), user.getAuthorities());
         result.setDetails((authentication.getDetails() != null)
-            ? authentication.getDetails().toString() : null);
+            ? authentication.getDetails() : null);
 
         return result;
     }