Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-08 16:42:10 +01:00
Code Issues Packages Projects Releases Activity

merge with branch 1.x

Browse Source
This commit is contained in:
Sebastian Sdorra
2014-12-06 15:42:10 +01:00
parent 7cb36c4a16 120fe9a5a4
commit d6ce7383d6
75 changed files with 5923 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scm-server/src/main/java/sonia/scm/server/ScmServer.java
View File

@@ -52,6 +52,9 @@ public class ScmServer extends Thread
/** Field description */
public static final String CONFIGURATION = "/server-config.xml";
/** Field description */
static final int GRACEFUL_TIMEOUT = 2000;
//~--- constructors ---------------------------------------------------------
/**
@@ -106,14 +109,17 @@ public class ScmServer extends Thread
}
/**
* Method description
* Stop embedded webserver. Use {@link Server#stop()} to fix windows service.
*
* @see <a href="http://goo.gl/Zfy0Ev">http://goo.gl/Zfy0Ev</a>
*/
public void stopServer()
{
try
{
server.setStopTimeout(GRACEFUL_TIMEOUT);
server.setStopAtShutdown(true);
server.stop();
initialized = false;
}
catch (Exception ex)