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

Unregister svn hook when handler is closed

Browse Source
This commit is contained in:
René Pfeuffer
2020-06-22 13:56:57 +02:00
parent 2706447238
commit 5dda141064
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryHandler.java
View File

@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package sonia.scm.repository;
//~--- non-JDK imports --------------------------------------------------------
@@ -76,6 +76,7 @@ public class SvnRepositoryHandler
private static final Logger logger =
LoggerFactory.getLogger(SvnRepositoryHandler.class);
private SvnRepositoryHook hook;
@Inject
public SvnRepositoryHandler(ConfigurationStoreFactory storeFactory,
@@ -94,7 +95,8 @@ public class SvnRepositoryHandler
// register hook
if (eventFacade != null)
{
FSHooks.registerHook(new SvnRepositoryHook(eventFacade, this));
hook = new SvnRepositoryHook(eventFacade, this);
FSHooks.registerHook(hook);
}
else if (logger.isWarnEnabled())
{
@@ -212,4 +214,12 @@ public class SvnRepositoryHandler
String getRepositoryId(File directory) {
return new SvnConfigHelper().getRepositoryId(directory);
}
@Override
public void close() throws IOException {
if (hook != null) {
FSHooks.unregisterHook(hook);
}
super.close();
}
}

22
scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/SvnRepositoryHandlerTest.java
View File

@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package sonia.scm.repository;
@@ -59,6 +59,8 @@ public class SvnRepositoryHandlerTest extends SimpleRepositoryHandlerTestBase {
private HookEventFacade facade = new HookEventFacade(repositoryManagerProvider, hookContextFactory);
private SvnRepositoryHandler handler;
@Override
protected void postSetUp() throws IOException, RepositoryPathNotFoundException {
initMocks(this);
@@ -82,7 +84,7 @@ public class SvnRepositoryHandlerTest extends SimpleRepositoryHandlerTestBase {
protected RepositoryHandler createRepositoryHandler(ConfigurationStoreFactory factory,
RepositoryLocationResolver locationResolver,
File directory) {
SvnRepositoryHandler handler = new SvnRepositoryHandler(factory, null, locationResolver, null);
SvnRepositoryHandler handler = new SvnRepositoryHandler(factory, facade, locationResolver, null);
handler.init(contextProvider);
@@ -95,16 +97,20 @@ public class SvnRepositoryHandlerTest extends SimpleRepositoryHandlerTestBase {
}
@Test
public void getDirectory() {
public void getDirectory() throws IOException {
when(factory.withType(any())).thenCallRealMethod();
SvnRepositoryHandler repositoryHandler = new SvnRepositoryHandler(factory,
facade, locationResolver, null);
SvnConfig svnConfig = new SvnConfig();
repositoryHandler.setConfig(svnConfig);
try {
SvnConfig svnConfig = new SvnConfig();
repositoryHandler.setConfig(svnConfig);
initRepository();
File path = repositoryHandler.getDirectory(repository.getId());
assertEquals(repoPath.toString()+File.separator+ RepositoryDirectoryHandler.REPOSITORIES_NATIVE_DIRECTORY, path.getAbsolutePath());
initRepository();
File path = repositoryHandler.getDirectory(repository.getId());
assertEquals(repoPath.toString() + File.separator + RepositoryDirectoryHandler.REPOSITORIES_NATIVE_DIRECTORY, path.getAbsolutePath());
} finally {
repositoryHandler.close();
}
}
}