From 4e1649c2b7ee86eb6e7129bd7f77f4e49a93ccdd Mon Sep 17 00:00:00 2001
From: Ben Alex <ben.alex@springsource.com>
Date: Wed, 20 Apr 2005 12:39:14 +0000
Subject: [PATCH] Fix NullPointerException caused by unit tests.

---
 .../x509/cache/EhCacheBasedX509UserCache.java | 24 ++++++++++++-------
 .../cache/EhCacheBasedX509UserCacheTests.java | 17 +++++++------
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/core/src/main/java/org/acegisecurity/providers/x509/cache/EhCacheBasedX509UserCache.java b/core/src/main/java/org/acegisecurity/providers/x509/cache/EhCacheBasedX509UserCache.java
index d2b711d0ca..6959b45f41 100644
--- a/core/src/main/java/org/acegisecurity/providers/x509/cache/EhCacheBasedX509UserCache.java
+++ b/core/src/main/java/org/acegisecurity/providers/x509/cache/EhCacheBasedX509UserCache.java
@@ -1,4 +1,4 @@
-/* Copyright 2004 Acegi Technology Pty Limited
+/* Copyright 2004, 2005 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.InitializingBean;
 
 import org.springframework.dao.DataRetrievalFailureException;
+
 import org.springframework.util.Assert;
 
 import java.security.cert.X509Certificate;
@@ -38,9 +39,11 @@ import java.security.cert.X509Certificate;
  * HREF="http://ehcache.sourceforge.net">EHCACHE</a>.
  *
  * @author Luke Taylor
+ * @author Ben Alex
  * @version $Id$
  */
-public class EhCacheBasedX509UserCache implements X509UserCache, InitializingBean {
+public class EhCacheBasedX509UserCache implements X509UserCache,
+    InitializingBean {
     //~ Static fields/initializers =============================================
 
     private static final Log logger = LogFactory.getLog(EhCacheBasedX509UserCache.class);
@@ -55,10 +58,6 @@ public class EhCacheBasedX509UserCache implements X509UserCache, InitializingBea
         this.cache = cache;
     }
 
-    public void afterPropertiesSet() throws Exception {
-        Assert.notNull(cache, "cache is mandatory");
-    }
-
     public UserDetails getUserFromCache(X509Certificate userCert) {
         Element element = null;
 
@@ -70,8 +69,13 @@ public class EhCacheBasedX509UserCache implements X509UserCache, InitializingBea
         }
 
         if (logger.isDebugEnabled()) {
-            logger.debug("X.509 Cache hit. SubjectDN: "
-                + userCert.getSubjectDN());
+            String subjectDN = "unknown";
+
+            if ((userCert != null) && (userCert.getSubjectDN() != null)) {
+                subjectDN = userCert.getSubjectDN().toString();
+            }
+
+            logger.debug("X.509 Cache hit. SubjectDN: " + subjectDN);
         }
 
         if (element == null) {
@@ -81,6 +85,10 @@ public class EhCacheBasedX509UserCache implements X509UserCache, InitializingBea
         }
     }
 
+    public void afterPropertiesSet() throws Exception {
+        Assert.notNull(cache, "cache is mandatory");
+    }
+
     public void putUserInCache(X509Certificate userCert, UserDetails user) {
         Element element = new Element(userCert, user);
 
diff --git a/core/src/test/java/org/acegisecurity/providers/x509/cache/EhCacheBasedX509UserCacheTests.java b/core/src/test/java/org/acegisecurity/providers/x509/cache/EhCacheBasedX509UserCacheTests.java
index 73bc203914..0efbf367ba 100644
--- a/core/src/test/java/org/acegisecurity/providers/x509/cache/EhCacheBasedX509UserCacheTests.java
+++ b/core/src/test/java/org/acegisecurity/providers/x509/cache/EhCacheBasedX509UserCacheTests.java
@@ -1,4 +1,4 @@
-/* Copyright 2004 Acegi Technology Pty Limited
+/* Copyright 2004, 2005 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,19 +17,21 @@ package net.sf.acegisecurity.providers.x509.cache;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.providers.dao.User;
-import net.sf.acegisecurity.providers.x509.X509TestUtils;
-import net.sf.acegisecurity.MockApplicationContext;
-import net.sf.acegisecurity.UserDetails;
 import net.sf.acegisecurity.GrantedAuthority;
 import net.sf.acegisecurity.GrantedAuthorityImpl;
+import net.sf.acegisecurity.MockApplicationContext;
+import net.sf.acegisecurity.UserDetails;
+import net.sf.acegisecurity.providers.dao.User;
+import net.sf.acegisecurity.providers.x509.X509TestUtils;
+
 import net.sf.ehcache.Cache;
 
 import org.springframework.context.ApplicationContext;
 
-import java.security.cert.X509Certificate;
 
 /**
+ * DOCUMENT ME!
+ *
  * @author Luke Taylor
  * @version $Id$
  */
@@ -58,7 +60,8 @@ public class EhCacheBasedX509UserCacheTests extends TestCase {
         // Check it gets stored in the cache
         cache.putUserInCache(X509TestUtils.buildTestCertificate(), getUser());
         assertEquals(getUser().getPassword(),
-            cache.getUserFromCache(X509TestUtils.buildTestCertificate()).getPassword());
+            cache.getUserFromCache(X509TestUtils.buildTestCertificate())
+                 .getPassword());
 
         // Check it gets removed from the cache
         cache.removeUserFromCache(X509TestUtils.buildTestCertificate());