Merge branch 'java-7' of github.com:jcoleman/tomcat-redis-session-manager into java-7

Author: jcoleman

src/main/java/com/radiadesign/catalina/session/JavaSerializer.java

@@ -19,11 +19,10 @@ public byte[] serializeFrom(HttpSession session) throws IOException {
 
     RedisSession redisSession = (RedisSession) session;
     ByteArrayOutputStream bos = new ByteArrayOutputStream();
-    ObjectOutputStream oos = new ObjectOutputStream(new BufferedOutputStream(bos));
-    oos.writeLong(redisSession.getCreationTime());
-    redisSession.writeObjectData(oos);
-
-    oos.close();
+    try (ObjectOutputStream oos = new ObjectOutputStream(new BufferedOutputStream(bos))) {
+      oos.writeLong(redisSession.getCreationTime());
+      redisSession.writeObjectData(oos);
+    }
 
     return bos.toByteArray();
   }

src/main/java/com/radiadesign/catalina/session/RedisSession.java

@@ -42,7 +42,7 @@ public HashMap<String, Object> getChangedAttributes() {
   }
 
   public void resetDirtyTracking() {
-    changedAttributes = new HashMap<String, Object>();
+    changedAttributes = new HashMap<>();
     dirty = false;
   }
 

src/main/java/com/radiadesign/catalina/session/RedisSessionManager.java

@@ -41,9 +41,9 @@ public class RedisSessionManager extends ManagerBase implements Lifecycle {
   protected JedisPool connectionPool;
 
   protected RedisSessionHandlerValve handlerValve;
-  protected ThreadLocal<RedisSession> currentSession = new ThreadLocal<RedisSession>();
-  protected ThreadLocal<String> currentSessionId = new ThreadLocal<String>();
-  protected ThreadLocal<Boolean> currentSessionIsPersisted = new ThreadLocal<Boolean>();
+  protected ThreadLocal<RedisSession> currentSession = new ThreadLocal<>();
+  protected ThreadLocal<String> currentSessionId = new ThreadLocal<>();
+  protected ThreadLocal<Boolean> currentSessionIsPersisted = new ThreadLocal<>();
   protected Serializer serializer;
 
   protected static String name = "RedisSessionManager";
@@ -197,13 +197,7 @@ protected synchronized void startInternal() throws LifecycleException {
 
     try {
       initializeSerializer();
-    } catch (ClassNotFoundException e) {
-      log.fatal("Unable to load serializer", e);
-      throw new LifecycleException(e);
-    } catch (InstantiationException e) {
-      log.fatal("Unable to load serializer", e);
-      throw new LifecycleException(e);
-    } catch (IllegalAccessException e) {
+    } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) {
       log.fatal("Unable to load serializer", e);
       throw new LifecycleException(e);
     }