Implemented: Handle service response effectively

(OFBIZ-9981)
Included Debug.logError in ServiceUtil.returnProblem so that in case of any 
error occurred and handled, it will always be logged on the console.
jleroux: I put a toString() there, Debug.logError() does not work with maps

Also no functional change (better code) in QRCodeEvents
jleroux: I also replaced tabs by spaces there 
            and put debug info in exceptions

Thanks: Suraj Khurana

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817455 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jacques Le Roux
2017-12-08 05:04:23 +00:00
parent cc50483f1d
commit cac7d76cba
2 changed files with 28 additions and 26 deletions
@@ -29,6 +29,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilHttp;
import org.apache.ofbiz.base.util.UtilMisc;
import org.apache.ofbiz.base.util.UtilProperties;
@@ -76,55 +77,55 @@ public class QRCodeEvents {
OutputStream os = response.getOutputStream();
Map<String, Object> context = UtilMisc.<String, Object>toMap("message", message, "format", format, "userLogin", userLogin, "locale", locale);
if (UtilValidate.isNotEmpty(width)) {
try {
try {
context.put("width", Integer.parseInt(width));
} catch (NumberFormatException e) {
// do nothing
}
} catch (NumberFormatException e) {
Debug.logWarning(e, e.getMessage(), module);
}
if (UtilValidate.isEmpty(height)) {
try {
try {
context.put("height", Integer.parseInt(width));
} catch (NumberFormatException e) {
// do nothing
}
} catch (NumberFormatException e) {
Debug.logWarning(e, e.getMessage(), module);
}
}
}
if (UtilValidate.isNotEmpty(height)) {
try {
try {
context.put("height", Integer.parseInt(height));
} catch (NumberFormatException e) {
// do nothing
}
} catch (NumberFormatException e) {
Debug.logWarning(e, e.getMessage(), module);
}
if (UtilValidate.isEmpty(width)) {
try {
try {
context.put("width", Integer.parseInt(height));
} catch (NumberFormatException e) {
// do nothing
}
} catch (NumberFormatException e) {
Debug.logWarning(e, e.getMessage(), module);
}
}
}
if (UtilValidate.isNotEmpty(encoding)) {
context.put("encoding", encoding);
}
if (UtilValidate.isNotEmpty(verifyOutput) && verifyOutput.booleanValue()) {
context.put("verifyOutput", verifyOutput);
context.put("verifyOutput", verifyOutput);
}
if (UtilValidate.isNotEmpty(logoImageMaxWidth)) {
try {
try {
context.put("logoImageMaxWidth", Integer.parseInt(logoImageMaxWidth));
} catch (NumberFormatException e) {
// do nothing
}
} catch (NumberFormatException e) {
Debug.logWarning(e, e.getMessage(), module);
}
}
if (UtilValidate.isNotEmpty(logoImageMaxHeight)) {
try {
try {
context.put("logoImageMaxHeight", Integer.parseInt(logoImageMaxHeight));
} catch (NumberFormatException e) {
// do nothing
}
} catch (NumberFormatException e) {
Debug.logWarning(e, e.getMessage(), module);
}
}
Map<String, Object> results = dispatcher.runSync("generateQRCodeImage", context);
if (!ServiceUtil.isError(results)) {
if (ServiceUtil.isSuccess(results)) {
BufferedImage bufferedImage = (BufferedImage) results.get("bufferedImage");
if (!ImageIO.write(bufferedImage, format, os)) {
String errMsg = UtilProperties.getMessage("QRCodeUiLabels", "ErrorWriteFormatToFile", new Object[] { format }, locale);