From 8770b99fdb6f47dea7b1f598633407e67b22572f Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Thu, 14 Apr 2022 15:09:45 +0200
Subject: - improved encoding of numerical values outside the allowed range -
 additional unit tests - fixes in the unused version 2 of FCB

---
 .../java/org/uic/barcode/ticket/api/asn/omv2/LineType.java | 14 ++++++++++----
 .../org/uic/barcode/ticket/api/asn/omv2/TravelerType.java  |  1 +
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'src/main/java/org/uic/barcode/ticket/api/asn/omv2')

diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv2/LineType.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv2/LineType.java
index fff4499..ffe19a3 100644
--- a/src/main/java/org/uic/barcode/ticket/api/asn/omv2/LineType.java
+++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv2/LineType.java
@@ -127,8 +127,11 @@ public class LineType extends Object {
 	}
 
 	public byte[] getBinaryZoneId() {
-		
-		return binaryZoneId.toByteArray();
+		if (binaryZoneId != null && binaryZoneId.size() > 0) {
+			return binaryZoneId.toByteArray();
+		} else {
+			return null;
+		}
 	}
 
 	public void setCarrierNum(Long carrierNum) {
@@ -177,8 +180,11 @@ public class LineType extends Object {
 	}
 
 	public void setBinaryZoneId(byte[] binaryZoneId) {
-
-		this.binaryZoneId = new OctetString(binaryZoneId);
+        if (binaryZoneId != null && binaryZoneId.length > 0) {
+        	this.binaryZoneId = new OctetString(binaryZoneId);
+        } else {
+        	this.binaryZoneId = null;
+        }
 	}
 
 
diff --git a/src/main/java/org/uic/barcode/ticket/api/asn/omv2/TravelerType.java b/src/main/java/org/uic/barcode/ticket/api/asn/omv2/TravelerType.java
index 30a7dfc..2522355 100644
--- a/src/main/java/org/uic/barcode/ticket/api/asn/omv2/TravelerType.java
+++ b/src/main/java/org/uic/barcode/ticket/api/asn/omv2/TravelerType.java
@@ -314,6 +314,7 @@ public class TravelerType extends Object {
 	public Date getDateOfBirth() {
 		
 		if (this.yearOfBirth == null) return null;
+		if (this.monthOfBirth == null) return null;
 		if (this.dayOfBirth == null) return null;
 		
 		Calendar cal = Calendar.getInstance();
-- 
cgit v1.2.3