[java-opensaml COMMIT] in /trunk/opensaml-util/src: main/java/org/opensaml/util/storage/AbstractStorageService.java t...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Apr 30 13:27:42 2013
New Revision: 3324

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3324&view=rev
Log:
Initial unit testing of storage, some bug fixes.

Added:
    trunk/opensaml-util/src/test/java/org/opensaml/util/storage/StorageServiceTest.java   (with props)
    trunk/opensaml-util/src/test/java/org/opensaml/util/storage/impl/
    trunk/opensaml-util/src/test/java/org/opensaml/util/storage/impl/MemoryStorageServiceTest.java   (with props)
Modified:
    trunk/opensaml-util/src/main/java/org/opensaml/util/storage/AbstractStorageService.java
    trunk/opensaml-util/src/test/resources/logback-test.xml

Modified: trunk/opensaml-util/src/main/java/org/opensaml/util/storage/AbstractStorageService.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-util/src/main/java/org/opensaml/util/storage/AbstractStorageService.java?rev=3324&r1=3323&r2=3324&view=diff
==============================================================================
--- trunk/opensaml-util/src/main/java/org/opensaml/util/storage/AbstractStorageService.java (original)
+++ trunk/opensaml-util/src/main/java/org/opensaml/util/storage/AbstractStorageService.java Tue Apr 30 13:27:42 2013
@@ -136,9 +136,16 @@
     
     /** {@inheritDoc} */
     protected void doDestroy() {
-        cleanupTask.cancel();
-        cleanupTask = null;
+        if (cleanupTask != null) {
+            cleanupTask.cancel();
+            cleanupTask = null;
+        }
         super.doDestroy();
+    }
+
+    /** {@inheritDoc} */
+    public synchronized void setId(String componentId) {
+        super.setId(componentId);
     }
     
     /** {@inheritDoc} */

Modified: trunk/opensaml-util/src/test/resources/logback-test.xml
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-util/src/test/resources/logback-test.xml?rev=3324&r1=3323&r2=3324&view=diff
==============================================================================
--- trunk/opensaml-util/src/test/resources/logback-test.xml (original)
+++ trunk/opensaml-util/src/test/resources/logback-test.xml Tue Apr 30 13:27:42 2013
@@ -9,8 +9,6 @@
         </encoder>
     </appender>
 
-    <logger name="org.opensaml" level="debug" />
-
     <root>
         <level value="warn" />
         <appender-ref ref="STDOUT" />