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

Fixes NPE in HgConfigPackageResource for non-existing packages.

Browse Source
This commit is contained in:
Johannes Schnatterer
2018-08-07 10:44:18 +02:00
parent 869821f6db
commit adde70f090
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/api/v2/resources/HgConfigPackageResource.java
View File

@@ -80,12 +80,15 @@ public class HgConfigPackageResource {
HgPackage pkg = pkgReader.getPackage(pkgId); HgPackage pkg = pkgReader.getPackage(pkgId);
// First path param cannot be null (leaving it results in 405) if (pkg != null) {
if (HgInstallerFactory.createInstaller() if (HgInstallerFactory.createInstaller()
.installPackage(client, handler, SCMContext.getContext().getBaseDirectory(), pkg)) { .installPackage(client, handler, SCMContext.getContext().getBaseDirectory(), pkg)) {
response = Response.noContent().build(); response = Response.noContent().build();
} else {
response = Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
}
} else { } else {
response = Response.status(Response.Status.INTERNAL_SERVER_ERROR).build(); response = Response.status(Response.Status.NOT_FOUND).build();
} }
return response; return response;

9
scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/api/v2/resources/HgConfigPackageResourceTest.java
View File

@@ -152,10 +152,11 @@ public class HgConfigPackageResourceTest {
@Test @Test
@SubjectAware(username = "writeOnly") @SubjectAware(username = "writeOnly")
public void shouldHandleMissingPackageId() throws Exception { public void shouldHandlePackagesThatAreNotFound() throws Exception {
String packageId = "this-package-does-not-ex";
MockHttpResponse response = put(null); when(hgPackageReader.getPackage(packageId)).thenReturn(null);
assertEquals(HttpServletResponse.SC_METHOD_NOT_ALLOWED, response.getStatus()); MockHttpResponse response = put(packageId);
assertEquals(HttpServletResponse.SC_NOT_FOUND, response.getStatus());
} }
@Test @Test