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

merge with branch issue-192

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-07-23 09:19:28 +02:00
parent 74ba4360e8 8656e5ed33
commit 0dfd8da743
5 changed files with 106 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,6 +35,7 @@ package sonia.scm.repository;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.base.Strings;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
@@ -42,6 +43,7 @@ import com.google.inject.Singleton;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.ArgumentIsInvalidException;
import sonia.scm.ConfigurationException;
import sonia.scm.HandlerEvent;
import sonia.scm.SCMContextProvider;
@@ -661,8 +663,15 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
@Override
public Repository getFromTypeAndUri(String type, String uri)
{
AssertUtil.assertIsNotEmpty(type);
AssertUtil.assertIsNotEmpty(uri);
if (Strings.isNullOrEmpty(type))
{
throw new ArgumentIsInvalidException("argument type is required");
}
if (Strings.isNullOrEmpty(uri))
{
throw new ArgumentIsInvalidException("argument uri is required");
}
// remove ;jsessionid, jetty bug?
uri = HttpUtil.removeMatrixParameter(uri);

2
scm-webapp/src/main/java/sonia/scm/web/cgi/DefaultCGIExecutor.java
View File

@@ -397,8 +397,8 @@ public class DefaultCGIExecutor extends AbstractCGIExecutor
processErrorStreamAsync(process);
processServletInput(process);
processIS = process.getInputStream();
servletOS = response.getOutputStream();
parseHeaders(processIS);
servletOS = response.getOutputStream();
long content = ByteStreams.copy(processIS, servletOS);