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

merge with bracnh issue-242

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-10-16 08:07:31 +02:00
parent 80173c6f4f 74a8eaec0f
commit 79501ec5fc
1 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitReceiveHook.java
View File

@@ -65,7 +65,6 @@ import java.io.File;
import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
/**
@@ -287,6 +286,11 @@ public class GitReceiveHook implements PreReceiveHook, PostReceiveHook
catch (Exception ex)
{
logger.error("could not handle receive commands", ex);
if (type == RepositoryHookType.PRE_RECEIVE)
{
sendError(rpack, receiveCommands, ex.getMessage());
}
}
}
@@ -339,6 +343,30 @@ public class GitReceiveHook implements PreReceiveHook, PostReceiveHook
}
}
/**
* Method description
*
*
* @param rpack
* @param commands
* @param message
*/
private void sendError(ReceivePack rpack, Iterable<ReceiveCommand> commands,
String message)
{
if (logger.isWarnEnabled())
{
logger.warn("abort git push request with msg: {}", message);
}
for (ReceiveCommand rc : commands)
{
rc.setResult(ReceiveCommand.Result.REJECTED_OTHER_REASON);
}
rpack.sendError(PREFIX_MSG.concat(Util.nonNull(message)));
}
/**
* Method description
*
@@ -350,8 +378,8 @@ public class GitReceiveHook implements PreReceiveHook, PostReceiveHook
*/
private void sendError(ReceivePack rpack, ReceiveCommand rc, String message)
{
rpack.sendError(PREFIX_MSG.concat(Util.nonNull(message)));
rc.setResult(ReceiveCommand.Result.REJECTED_OTHER_REASON);
rpack.sendError(PREFIX_MSG.concat(Util.nonNull(message)));
}
//~--- get methods ----------------------------------------------------------