Removed duplicated code, added code to empty catch block and change variable name

Author: tomas-sexenian

java/src/main/java/com/genexus/reports/PDFReportItext8.java

@@ -635,8 +635,7 @@ else if (valign == VerticalAlign.BOTTOM.value())
 				Rectangle htmlRectangle = new Rectangle(llx, lly, urx - llx, ury - lly);
 				YPosition yPosition = new YPosition(htmlRectangle.getTop());
 
-				Canvas htmlCanvas = new Canvas(cb, htmlRectangle);
-				htmlCanvas.setFontProvider(fontProvider);
+				Canvas htmlCanvas = getNewCanvas(cb, htmlRectangle, fontProvider);
 
 				//Iterate over the elements (a.k.a the parsed HTML string) and handle each case accordingly
 				List<IElement> elements = HtmlConverter.convertToElements(sTxt, converterProperties);
@@ -659,8 +658,7 @@ else if (valign == VerticalAlign.BOTTOM.value())
 						cb.setFontAndSize(this.baseFont, fontSize);
 						cb.setFillColor(new DeviceRgb(foreColor));
 
-						htmlCanvas = new Canvas(cb, htmlRectangle);
-						htmlCanvas.setFontProvider(fontProvider);
+						htmlCanvas = getNewCanvas(cb, htmlRectangle, fontProvider);
 					}
 					processHTMLElement((IBlockElement)element, alignment, htmlCanvas);
 					yPosition.setCurrentYPosition(yPosition.getCurrentYPosition() - blockElementHeight);
@@ -788,6 +786,12 @@ else if (valign == VerticalAlign.BOTTOM.value())
 		}
 	}
 
+	private Canvas getNewCanvas(PdfCanvas pdfCanvas, Rectangle rectangle, FontProvider fontProvider) {
+		Canvas canvas = new Canvas(pdfCanvas, rectangle);
+		canvas.setFontProvider(fontProvider);
+		return canvas;
+	}
+
 	void processHTMLElement(IBlockElement blockElement, int alignment, Canvas htmlCanvas){
 		if (blockElement instanceof Paragraph) {
 			Paragraph p = (Paragraph) blockElement;

java/src/main/java/com/genexus/reports/PDFReportPDFBox.java

@@ -637,8 +637,8 @@ else if (valign == PDFReportPDFBox.VerticalAlign.BOTTOM.value())
 
 					loadSupportedHTMLTags();
 
-					Document document = Jsoup.parse(sTxt);
-					Elements allElements = document.getAllElements();
+					Document htmlDocument = Jsoup.parse(sTxt);
+					Elements allElements = htmlDocument.getAllElements();
 					for (Element element : allElements){
 						if (pageHeightExceeded(bottomMargin, spaceHandler.getCurrentYPosition())) {
 							llx = leftAux + leftMargin;
@@ -652,7 +652,7 @@ else if (valign == PDFReportPDFBox.VerticalAlign.BOTTOM.value())
 							GxStartPage();
 
 							cb.close();
-							cb = new PDPageContentStream(this.document, this.document.getPage(page - 1),PDPageContentStream.AppendMode.APPEND,false);
+							cb = new PDPageContentStream(document, document.getPage(page - 1),PDPageContentStream.AppendMode.APPEND,false);
 						}
 						if (this.supportedHTMLTags.contains(element.normalName()))
 							processHTMLElement(cb, htmlRectangle, spaceHandler, element);
@@ -870,7 +870,12 @@ else if (valign == PDFReportPDFBox.VerticalAlign.BOTTOM.value())
 		} catch (Exception ioe){
 			log.error("GxDrawText failed: ", ioe);
 		} finally {
-			try {if (cb != null) cb.close();} catch (IOException ioe) {}
+			try {
+				if (cb != null) cb.close();
+			}
+			catch (IOException ioe) {
+				log.error("GxDrawText failed to close a content stream to one of it's pages: ", ioe);
+			}
 		}
 	}
 
@@ -1324,8 +1329,8 @@ public void GxEndDocument() {
 			try {
 				document.save(outputStream);
 				document.close();
-			} catch (IOException ioe) {
-				log.error("GxEndDocument: failed to save document to the output stream", ioe);
+			} catch (IOException | IllegalStateException e) {
+				log.error("GxEndDocument: failed to save document to the output stream", e);
 			}
 
 			log.debug("GxEndDocument!");