Skip to content

Commit

Permalink
#52: fix boolean property parsing bug
Browse files Browse the repository at this point in the history
  • Loading branch information
FelipeFcosta committed Feb 9, 2023
1 parent 8b34806 commit 9f4de1c
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions iped-engine/src/main/java/iped/engine/task/HTMLReportTask.java
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@

import javax.imageio.ImageIO;

import org.apache.commons.lang3.BooleanUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -97,8 +96,8 @@ public class HTMLReportTask extends AbstractTask {

private IPEDSource ipedCase;

private static final String propNamePlaceHolder = "%PROPERTY_NAME%";
private static final String propValuePlaceHolder = "%PROPERTY_VALUE%";
private static final String PROP_NAME_PLACEHOLDER = "%PROPERTY_NAME%";
private static final String PROP_VALUE_PLACEHOLDER = "%PROPERTY_VALUE%";

private static final String SELECTED_PROPERTIES_FILENAME = "data/reportProps.dat";

Expand Down Expand Up @@ -835,14 +834,14 @@ private void createBookmarkPage(DateFormat dateFormat, NumberFormat longFormat,
}

private void fillItemProperty(StringBuilder it, String propertyName, String propertyValue) {
Boolean boolProperty = BooleanUtils.toBooleanObject(propertyValue);
if (boolProperty != null) {
if (propertyValue != null && (propertyValue.equals(Boolean.TRUE.toString()) || propertyValue.equals(Boolean.FALSE.toString()))) {
boolean boolProperty = Boolean.parseBoolean(propertyValue);
propertyValue = boolProperty ? Messages.getString("HTMLReportTask.Yes")
: Messages.getString("HTMLReportTask.No");
}

replaceFirst(it, propNamePlaceHolder, propertyName);
replaceFirst(it, propValuePlaceHolder, propertyValue);
replaceFirst(it, PROP_NAME_PLACEHOLDER, propertyName);
replaceFirst(it, PROP_VALUE_PLACEHOLDER, propertyValue);
}

private String getComments(String bookmark) {
Expand Down

0 comments on commit 9f4de1c

Please sign in to comment.