LPS-26390 Source formatting

juliocamarero · Apr 20, 2012 · d1c20c0 · d1c20c0
1 parent 97616ec
commit d1c20c0
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/portal-impl/test/integration/com/liferay/portal/util/BaseJsonClientTestCase.java b/portal-impl/test/integration/com/liferay/portal/util/BaseJsonClientTestCase.java
@@ -161,21 +161,26 @@ public String parseResponseContent(
 
 		beginIndex += variable.length() + 1;
 
+		int endIndex = -1;
+
 		if (string) {
 			beginIndex++;
 
-			int endIndex = responseContent.indexOf("\",", beginIndex);
+			endIndex = responseContent.indexOf("\",", beginIndex);
 
 			if (endIndex == -1) {
 				endIndex = responseContent.length() - 2;
 			}
-
-			return responseContent.substring(beginIndex, endIndex);
 		}
 		else {
-			return responseContent.substring(
-				beginIndex, responseContent.indexOf(",", beginIndex));
+			endIndex = responseContent.indexOf(",", beginIndex);
+
+			if (endIndex == -1) {
+				endIndex = responseContent.length() - 1;
+			}
 		}
+
+		return responseContent.substring(beginIndex, endIndex);
 	}
 
 	private class StringHandler implements ResponseHandler<String> {
@@ -191,9 +196,7 @@ public String handleResponse(HttpResponse response)
 				return null;
 			}
 
-			String responseContent = EntityUtils.toString(httpEntity);
-
-			return responseContent;
+			return EntityUtils.toString(httpEntity);
 		}
 
 		protected void checkStatusCode(StatusLine statusLine)