You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/02/18 00:51:09 UTC
svn commit: r1447103 - in /archiva/trunk/archiva-modules:
archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/
metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/
Author: olamy
Date: Sun Feb 17 23:51:08 2013
New Revision: 1447103
URL: http://svn.apache.org/r1447103
Log:
add closeQuietly method for repository session when only reading we can ignore this error.
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/MetadataRepository.java
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/RepositorySession.java
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java?rev=1447103&r1=1447102&r2=1447103&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java Sun Feb 17 23:51:08 2013
@@ -703,7 +703,7 @@ public class DefaultBrowseService
{
if ( session != null )
{
- session.close();
+ session.closeQuietly();
}
}
Modified: archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/MetadataRepository.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/MetadataRepository.java?rev=1447103&r1=1447102&r2=1447103&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/MetadataRepository.java (original)
+++ archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/MetadataRepository.java Sun Feb 17 23:51:08 2013
@@ -197,11 +197,18 @@ public interface MetadataRepository
throws MetadataRepositoryException;
+ /**
+ * <b>implementations can throw RuntimeException</b>
+ */
void save();
+
void close()
throws MetadataRepositoryException;
+ /**
+ * <b>implementations can throw RuntimeException</b>
+ */
void revert();
boolean canObtainAccess( Class<?> aClass );
Modified: archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/RepositorySession.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/RepositorySession.java?rev=1447103&r1=1447102&r2=1447103&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/RepositorySession.java (original)
+++ archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/RepositorySession.java Sun Feb 17 23:51:08 2013
@@ -82,6 +82,7 @@ public class RepositorySession
* If the session has been marked as dirty, it will be saved. This may save partial changes in the case of a typical
* <code>try { ... } finally { ... }</code> approach - if this is a problem, ensure you revert changes when an
* exception occurs.
+ * <b>can throw RuntimeException</b>
*/
public void close()
{
@@ -105,6 +106,18 @@ public class RepositorySession
}
}
+ public void closeQuietly()
+ {
+ try
+ {
+ this.close();
+ }
+ catch ( RuntimeException e )
+ {
+ log.warn( "ignore Runtime exception while closing: {}", e.getMessage() );
+ }
+ }
+
public void markDirty()
{