[java-identity-provider COMMIT] in /trunk/idp-session-impl/src: main/java/net/shibboleth/idp/session/impl/StorageBack...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Oct  2 13:21:01 2013
New Revision: 4813

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4813&view=rev
Log:
First unit test and some bug fixes.

Added:
    trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/StorageBackedSessionManagerTest.java   (with props)
Modified:
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedSessionManager.java
    trunk/idp-session-impl/src/test/resources/logback-test.xml

Modified: trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedSessionManager.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedSessionManager.java?rev=4813&r1=4812&r2=4813&view=diff
==============================================================================
--- trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedSessionManager.java (original)
+++ trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedSessionManager.java Wed Oct  2 13:21:01 2013
@@ -417,7 +417,12 @@
         if (criteria != null) {
             SessionIdCriterion sessionIdCriterion = criteria.get(SessionIdCriterion.class);
             if (sessionIdCriterion != null) {
-                return ImmutableList.of(lookupBySessionId(sessionIdCriterion.getSessionId()));
+                IdPSession session = lookupBySessionId(sessionIdCriterion.getSessionId());
+                if (session != null) {
+                    return ImmutableList.of(session);
+                } else {
+                    return ImmutableList.of();
+                }
             }
             
             ServiceSessionCriterion serviceCriterion = criteria.get(ServiceSessionCriterion.class);
@@ -452,9 +457,15 @@
      * @throws ResolverException if an error occurs during lookup
      */
     @Nullable private IdPSession lookupBySessionId(@Nonnull @NotEmpty final String sessionId) throws ResolverException {
+        log.debug("Performing primary lookup on session ID {}", sessionId);
+        
         try {
             StorageRecord<StorageBackedIdPSession> sessionRecord = storageService.read(sessionId, SESSION_MASTER_KEY);
-            return sessionRecord.getValue(serializer, sessionId, SESSION_MASTER_KEY);
+            if (sessionRecord != null) {
+                return sessionRecord.getValue(serializer, sessionId, SESSION_MASTER_KEY);
+            } else {
+                log.debug("Primary lookup failed for session ID {}", sessionId);
+            }
         } catch (IOException e) {
             log.error("Exception while querying for session " + sessionId, e);
             if (!maskStorageFailure) {
@@ -503,7 +514,7 @@
         }
 
         if (sessionList == null) {
-            log.debug("Secondary lookup found nothing");
+            log.debug("Secondary lookup failed on service ID {} and key {}", serviceId, serviceKey);
             return ImmutableList.of();
         }
 

Modified: trunk/idp-session-impl/src/test/resources/logback-test.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-session-impl/src/test/resources/logback-test.xml?rev=4813&r1=4812&r2=4813&view=diff
==============================================================================
Binary files - no diff available.