From 9c1dec2f31e121b0f23a0270211961f3398445ac Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Mon, 11 Apr 2022 09:26:40 +0200
Subject: nullpointer exception fixed in dynamic content of dosipas

---
 .../barcode/dynamicContent/api/DynamicContentCoder.java  | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'src/main/java/org/uic/barcode/dynamicContent/api/DynamicContentCoder.java')

diff --git a/src/main/java/org/uic/barcode/dynamicContent/api/DynamicContentCoder.java b/src/main/java/org/uic/barcode/dynamicContent/api/DynamicContentCoder.java
index 34406e0..00b5824 100644
--- a/src/main/java/org/uic/barcode/dynamicContent/api/DynamicContentCoder.java
+++ b/src/main/java/org/uic/barcode/dynamicContent/api/DynamicContentCoder.java
@@ -92,8 +92,12 @@ public class DynamicContentCoder {
 			
 			GeoCoordinateType asnPoint = new GeoCoordinateType();
 			
-			asnPoint.setLatitude(point.getLatitude());  
-			asnPoint.setLongitude(point.getLongitude());
+			if (point.getLatitude() != null) {
+				asnPoint.setLatitude(point.getLatitude());  
+			}
+			if (point.getLongitude() != null) {
+				asnPoint.setLongitude(point.getLongitude());
+			}
 			
 			if (point.getUnit() != IGeoUnitType.milliDegree && point.getUnit() != null){
 				asnPoint.setGeoUnit(GeoUnitType.valueOf(point.getUnit().name()));
@@ -169,8 +173,12 @@ public class DynamicContentCoder {
 		
 		IGeoCoordinate g = new SimpleGeoCoordinate();
 		
-		g.setLatitude(asnCoordinate.getLatitude());
-		g.setLongitude(asnCoordinate.getLongitude());
+		if (asnCoordinate.getLatitude() != null) {
+			g.setLatitude(asnCoordinate.getLatitude());
+		}
+		if (asnCoordinate.getLongitude() != null) {
+			g.setLongitude(asnCoordinate.getLongitude());
+		}
 		
 		if (asnCoordinate.getCoordinateSystem() != null) {
 			g.setSystem(IGeoCoordinateSystemType.valueOf(asnCoordinate.getCoordinateSystem().name()));
-- 
cgit v1.2.3


From 0ea854b3232f1dc33bb55f2ef9946f72dc40ed21 Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Mon, 11 Apr 2022 09:30:06 +0200
Subject: nullpointer

---
 .../java/org/uic/barcode/dynamicContent/api/DynamicContentCoder.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/main/java/org/uic/barcode/dynamicContent/api/DynamicContentCoder.java')

diff --git a/src/main/java/org/uic/barcode/dynamicContent/api/DynamicContentCoder.java b/src/main/java/org/uic/barcode/dynamicContent/api/DynamicContentCoder.java
index 00b5824..a4d38c6 100644
--- a/src/main/java/org/uic/barcode/dynamicContent/api/DynamicContentCoder.java
+++ b/src/main/java/org/uic/barcode/dynamicContent/api/DynamicContentCoder.java
@@ -162,8 +162,9 @@ public class DynamicContentCoder {
 		
 		content.setGeoCoordinate(getGeoCoordinate(asn.getGeoCoordinate()));
 		
-		content.setTimeStamp(asn.getTimeStamp().getTimeAsDate());
-		
+		if (asn.getTimeStamp() != null) {
+			content.setTimeStamp(asn.getTimeStamp().getTimeAsDate());
+		}
 
 		return content;
 
-- 
cgit v1.2.3


From 6c625e1491ec3260790765f002ce75cf6fdd369c Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Mon, 11 Apr 2022 09:36:04 +0200
Subject: nullpointer

---
 .../java/org/uic/barcode/dynamicContent/api/DynamicContentCoder.java    | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/main/java/org/uic/barcode/dynamicContent/api/DynamicContentCoder.java')

diff --git a/src/main/java/org/uic/barcode/dynamicContent/api/DynamicContentCoder.java b/src/main/java/org/uic/barcode/dynamicContent/api/DynamicContentCoder.java
index a4d38c6..ea90879 100644
--- a/src/main/java/org/uic/barcode/dynamicContent/api/DynamicContentCoder.java
+++ b/src/main/java/org/uic/barcode/dynamicContent/api/DynamicContentCoder.java
@@ -172,6 +172,8 @@ public class DynamicContentCoder {
 
 	private static IGeoCoordinate getGeoCoordinate(GeoCoordinateType asnCoordinate) {
 		
+		if (asnCoordinate == null) return null;
+		
 		IGeoCoordinate g = new SimpleGeoCoordinate();
 		
 		if (asnCoordinate.getLatitude() != null) {
-- 
cgit v1.2.3


From 44f3079ffeb5cdb6d5338b48f0a6460c24f2503e Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Mon, 11 Apr 2022 09:39:35 +0200
Subject: nullpointer

---
 .../dynamicContent/api/DynamicContentCoder.java    | 28 ++++++++++++----------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'src/main/java/org/uic/barcode/dynamicContent/api/DynamicContentCoder.java')

diff --git a/src/main/java/org/uic/barcode/dynamicContent/api/DynamicContentCoder.java b/src/main/java/org/uic/barcode/dynamicContent/api/DynamicContentCoder.java
index ea90879..b49bcb9 100644
--- a/src/main/java/org/uic/barcode/dynamicContent/api/DynamicContentCoder.java
+++ b/src/main/java/org/uic/barcode/dynamicContent/api/DynamicContentCoder.java
@@ -57,21 +57,25 @@ public class DynamicContentCoder {
 	
 
 	private static SequenceOfExtension getAsnContentExtensions(UicDynamicContentDataFDC1 asn, List<IExtension> dynamicContentResponseList) throws EncodingFormatException {
-		if (dynamicContentResponseList != null && !dynamicContentResponseList.isEmpty()){
+		if (dynamicContentResponseList == null || dynamicContentResponseList.isEmpty()){
+			return null;
+		}
 			
-			SequenceOfExtension asnList = asn.getExtensions();
-			if (asnList == null) asnList = new SequenceOfExtension();
-			for (IExtension extension : dynamicContentResponseList){
-				ExtensionData asnExtension = getAsnExtension(extension);
-				if (asnExtension!= null) {
-					asnList.add(asnExtension);
-				}
-			}
-			if (!asnList.isEmpty()){
-				return asnList;
+		SequenceOfExtension asnList = asn.getExtensions();
+		if (asnList == null) {
+			asnList = new SequenceOfExtension();
+		}
+		
+		for (IExtension extension : dynamicContentResponseList){
+			ExtensionData asnExtension = getAsnExtension(extension);
+			if (asnExtension!= null) {
+				asnList.add(asnExtension);
 			}
 		}
-	
+		if (!asnList.isEmpty()){
+			return asnList;
+		}
+			
 		return null;
 	}
 
-- 
cgit v1.2.3