only close session if open

getJcrSession will open one if needed, which close does not need to do. This
also caused some timing issues in the REST tests as it concurrently operated
on the same session

diff --git a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
index e6c18675b9edd03efc49b04dbc25fb52141f80fc..fbfe373868bdef9edbdc503837ae75ca1a677597 100644 (file)
--- a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
+++ b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
@@ -1313,17 +1313,9 @@ public class JcrMetadataRepository
     public void close()
         throws MetadataRepositoryException
     {
-        try
+        if ( jcrSession != null && jcrSession.isLive() )
         {
-            if ( getJcrSession().isLive() )
-            {
-                getJcrSession().logout();
-            }
-        }
-        catch ( RepositoryException e )
-        {
-            log.error( e.getMessage(), e );
-            throw new MetadataRepositoryException( e.getMessage(), e );
+            jcrSession.logout();
         }
     }