[java-opensaml COMMIT] /trunk/opensaml-util/src/main/java/org/opensaml/util/storage/impl/MemoryStorageService.java

[noreply at shibboleth.net]

Author: scantor
Date: Thu Apr  4 17:05:31 2013
New Revision: 3283

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3283&view=rev
Log:
Minor cleanup

Modified:
    trunk/opensaml-util/src/main/java/org/opensaml/util/storage/impl/MemoryStorageService.java

Modified: trunk/opensaml-util/src/main/java/org/opensaml/util/storage/impl/MemoryStorageService.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-util/src/main/java/org/opensaml/util/storage/impl/MemoryStorageService.java?rev=3283&r1=3282&r2=3283&view=diff
==============================================================================
--- trunk/opensaml-util/src/main/java/org/opensaml/util/storage/impl/MemoryStorageService.java (original)
+++ trunk/opensaml-util/src/main/java/org/opensaml/util/storage/impl/MemoryStorageService.java Thu Apr  4 17:05:31 2013
@@ -346,9 +346,8 @@
             Map<String, MutableStorageRecord> dataMap = contextMap.get(context);
             if (dataMap != null) {    
                 Long now = System.currentTimeMillis();
-                Optional<Long> exp;
                 for (MutableStorageRecord record : dataMap.values()) {
-                    exp = record.getExpiration();
+                    final Optional<Long> exp = record.getExpiration();
                     if (!exp.isPresent() || now < (exp.get() * 1000)) {
                         record.setExpiration(expiration);
                     }
@@ -434,12 +433,10 @@
             try {
                 writeLock.lock();
                 
-                Map<String, MutableStorageRecord> context;
-                
                 Collection<Map<String, MutableStorageRecord>> contexts = contextMap.values();
                 Iterator<Map<String, MutableStorageRecord>> i = contexts.iterator();
                 while (i.hasNext()) {
-                    context = i.next(); 
+                    final Map<String, MutableStorageRecord> context = i.next(); 
                     if (reapWithLock(i.next(), now)) {
                         purged = true;
                         if (context.isEmpty()) {