Просмотр исходного кода

Handle null domain ojbect (useful if a search didn't find a match).

Ben Alex 20 лет назад
Родитель
Сommit
28a960cfab

+ 2 - 4
domain/src/main/java/org/acegisecurity/domain/dao/EvictionUtils.java

@@ -40,15 +40,13 @@ public class EvictionUtils {
      *
      * @param daoOrServices the potential source for
      *        <code>EvictionCapable</code> services (never <code>null</code>)
-     * @param entity to evict (never <code>null</code>)
+     * @param entity to evict (can be <code>null</code>)
      */
     public static void evictIfRequired(Object daoOrServices,
         PersistableEntity entity) {
-        Assert.notNull(entity, "Cannot evict an empty PersistableEntity object!");
-
         EvictionCapable evictor = getEvictionCapable(daoOrServices);
 
-        if (evictor != null) {
+        if (evictor != null && entity != null) {
             evictor.evict(entity);
         }
     }