Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-14 17:26:22 +01:00
Code Issues Packages Projects Releases Activity

Merge with upstream

Browse Source
This commit is contained in:
René Pfeuffer
2018-07-12 11:31:55 +02:00
parent a1c1bc1042 8593e1dc58
commit 43dbb6e0aa
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scm-webapp/src/main/java/sonia/scm/api/rest/RepositoryAlreadyExistsExceptionMapper.java Normal file
View File

@@ -0,0 +1,16 @@
package sonia.scm.api.rest;
import sonia.scm.repository.RepositoryAlreadyExistsException;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import javax.ws.rs.ext.ExceptionMapper;
import javax.ws.rs.ext.Provider;
@Provider
public class RepositoryAlreadyExistsExceptionMapper implements ExceptionMapper<RepositoryAlreadyExistsException> {
@Override
public Response toResponse(RepositoryAlreadyExistsException exception) {
return Response.status(Status.CONFLICT).build();
}
}

1
scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
View File

@@ -214,6 +214,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
RepositoryPermissions.modify(oldRepository).check(); RepositoryPermissions.modify(oldRepository).check();
fireEvent(HandlerEventType.BEFORE_MODIFY, repository, oldRepository); fireEvent(HandlerEventType.BEFORE_MODIFY, repository, oldRepository);
repository.setLastModified(System.currentTimeMillis()); repository.setLastModified(System.currentTimeMillis());
repository.setCreationDate(oldRepository.getCreationDate());
getHandler(repository).modify(repository); getHandler(repository).modify(repository);
repositoryDAO.modify(repository); repositoryDAO.modify(repository);
fireEvent(HandlerEventType.MODIFY, repository, oldRepository); fireEvent(HandlerEventType.MODIFY, repository, oldRepository);