Fixed bug + test

nfms4redd · Jun 27, 2013 · 2ee737f · 2ee737f
1 parent 656c6e9
commit 2ee737f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/src/main/java/org/fao/unredd/portal/IndicatorsController.java b/src/main/java/org/fao/unredd/portal/IndicatorsController.java
@@ -47,17 +47,13 @@ public void returnIndicators(String layerId) throws IOException,
 				Outputs indicators = layer.getOutputs();
 				response.setContentType("application/json;charset=UTF-8");
 				answer = indicators.toJSON();
-				try {
-					response.getWriter().print(answer);
-					response.flushBuffer();
-				} catch (IOException e) {
-					logger.error("Error returning the indicators", e);
-					response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-				}
-			} else {
-				logger.error("the layer does not exist");
-				ApplicationController.ErrorCause.ILLEGAL_ARGUMENT
-						.writeError(response);
+			}
+			try {
+				response.getWriter().print(answer);
+				response.flushBuffer();
+			} catch (IOException e) {
+				logger.error("Error returning the indicators", e);
+				response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
 			}
 		}
 	}

diff --git a/src/test/java/org/fao/unredd/portal/IndicatorsTest.java b/src/test/java/org/fao/unredd/portal/IndicatorsTest.java
@@ -115,6 +115,7 @@ public void testIndicatorsUnexistantLayer() throws Exception {
 		when(layerFactory.exists(anyString())).thenReturn(false);
 		indicators.returnIndicators("");
 		verify(layerFactory, never()).newLayer(anyString());
+		verify(response, never()).setStatus(anyInt());
 	}
 
 	@Test