From fa24701921cbbf0a2078111b67023c69ca0f4e1e Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 21 May 2017 01:20:40 -0700
Subject: [PATCH] Java 8 compatibility.

---
 build.gradle                                   |  7 ++++---
 .../com/opensymphony/oscache/base/Cache.java   | 18 +++++++-----------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1ed576b..cc364a2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,9 +5,6 @@ version = '2.4.2'
 
 description = 'OSCache'
 
-sourceCompatibility = 1.4
-targetCompatibility = 1.4
-
 repositories {
     mavenCentral()
 }
@@ -24,3 +21,7 @@ dependencies {
     testCompile group: 'junitperf', name: 'junitperf', version:'1.9.1'
     testCompile group: 'groboutils', name: 'groboutils-core', version:'5'
 }
+
+compileJava {
+    // options.compilerArgs << '-Xlint:deprecation'
+}
diff --git a/src/main/java/com/opensymphony/oscache/base/Cache.java b/src/main/java/com/opensymphony/oscache/base/Cache.java
index a50bd0b..39325dd 100644
--- a/src/main/java/com/opensymphony/oscache/base/Cache.java
+++ b/src/main/java/com/opensymphony/oscache/base/Cache.java
@@ -10,17 +10,13 @@ import com.opensymphony.oscache.base.algorithm.UnlimitedCache;
 import com.opensymphony.oscache.base.events.*;
 import com.opensymphony.oscache.base.persistence.PersistenceListener;
 import com.opensymphony.oscache.util.FastCronParser;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import java.io.Serializable;
-
-import java.text.ParseException;
-
-import java.util.*;
-
 import javax.swing.event.EventListenerList;
+import java.io.Serializable;
+import java.text.ParseException;
+import java.util.*;
 
 /**
  * Provides an interface to the cache itself. Creating an instance of this class
@@ -356,8 +352,8 @@ public class Cache implements Serializable {
      * @since 2.4
      */
     public void addCacheEventListener(CacheEventListener listener) {
-        // listenerList.add(CacheEventListener.class, listener);
-        listenerList.add(listener.getClass(), listener);
+        listenerList.add(CacheEventListener.class, listener);
+        // listenerList.add(listener.getClass(), listener);
     }
     
     /**
@@ -669,8 +665,8 @@ public class Cache implements Serializable {
      * @since 2.4
      */
     public void removeCacheEventListener(CacheEventListener listener) {
-        // listenerList.remove(CacheEventListener.class, listener);
-        listenerList.remove(listener.getClass(), listener);
+        listenerList.remove(CacheEventListener.class, listener);
+        // listenerList.remove(listener.getClass(), listener);
     }
 
     /**