Merge base branch into feature

This commit is contained in:
René Pfeuffer
2018-07-05 15:03:18 +02:00
29 changed files with 302 additions and 274 deletions

View File

@@ -114,7 +114,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
}
public void create(Repository repository, boolean initRepository)
throws RepositoryException, IOException {
throws RepositoryException {
logger.info("create repository {} of type {}", repository.getName(),
repository.getType());
@@ -140,13 +140,13 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
@Override
public void create(Repository repository)
throws RepositoryException, IOException {
throws RepositoryException {
create(repository, true);
}
@Override
public void delete(Repository repository)
throws RepositoryException, IOException {
throws RepositoryException {
if (logger.isInfoEnabled()) {
logger.info("delete repository {} of type {}", repository.getName(),
repository.getType());
@@ -182,7 +182,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
@Override
public void modify(Repository repository)
throws RepositoryException, IOException {
throws RepositoryException {
if (logger.isInfoEnabled()) {
logger.info("modify repository {} of type {}", repository.getName(),
repository.getType());
@@ -208,7 +208,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
@Override
public void refresh(Repository repository)
throws RepositoryException, IOException {
throws RepositoryException {
AssertUtil.assertIsNotNull(repository);
RepositoryPermissions.read(repository).check();

View File

@@ -35,10 +35,8 @@ package sonia.scm.repository;
import com.google.common.eventbus.Subscribe;
import com.google.inject.Inject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.EagerSingleton;
import sonia.scm.plugin.Extension;
import sonia.scm.web.security.AdministrationContext;
@@ -46,8 +44,6 @@ import sonia.scm.web.security.PrivilegedAction;
//~--- JDK imports ------------------------------------------------------------
import java.io.IOException;
/**
*
* @author Sebastian Sdorra
@@ -154,7 +150,7 @@ public final class LastModifiedUpdateListener
{
repositoryManager.modify(dbr);
}
catch (RepositoryException | IOException ex)
catch (RepositoryException ex)
{
logger.error("could not modify repository", ex);
}