Repository: stratos
Updated Branches:
  refs/heads/master 647cd411a -> dcf405c6a


fix incorrect status return on cartridge not found  [jira-1378]


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f5a9ef5c
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f5a9ef5c
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f5a9ef5c

Branch: refs/heads/master
Commit: f5a9ef5c0a6fd3817a54e2b6d1a32ea698e0b75f
Parents: 647cd41
Author: Dakshika Jayathilaka <[email protected]>
Authored: Sat May 9 06:17:01 2015 +0530
Committer: Dakshika Jayathilaka <[email protected]>
Committed: Sat May 9 06:17:01 2015 +0530

----------------------------------------------------------------------
 .../java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/f5a9ef5c/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
 
b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
index a6637fd..d308e6e 100644
--- 
a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
+++ 
b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java
@@ -323,7 +323,7 @@ public class StratosApiV41 extends AbstractApi {
         List<CartridgeBean> cartridges = 
StratosApiV41Utils.getAvailableCartridges(null, false, getConfigContext());
         if (cartridges == null || cartridges.isEmpty()) {
             return Response.status(Response.Status.NOT_FOUND).entity(new 
StatusResponseBean(
-                    Response.Status.CONFLICT.getStatusCode(), "No cartridges 
found")).build();
+                    Response.Status.NOT_FOUND.getStatusCode(), "No cartridges 
found")).build();
         }
         CartridgeBean[] cartridgeArray = cartridges.toArray(new 
CartridgeBean[cartridges.size()]);
         return Response.ok().entity(cartridgeArray).build();

Reply via email to