local merge

Merge branch 'master' of https://gitlab.iaik.tugraz.at/egiz/moa-sig

1 files changed, 17 insertions, 3 deletions

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/TslInfosImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/TslInfosImpl.java
index 4c40a5f..fad42e6 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/TslInfosImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/TslInfosImpl.java
@@ -11,16 +11,23 @@ public class TslInfosImpl implements TslInfos {
 	private String tslServiceTypeIdentifier;
 	private String tslServiceTypeStatus;
 	private List<String> tslServiceQualifier = new ArrayList<String>();
+	private List<String> tslAdditionalServiceInformation = new ArrayList<String>();
 	private String tslCountry;
 	
-	public TslInfosImpl(String country, String tslServiceTypeStatus, String tslServiceTypeIdentifier, List<URI> tslCertificateQualifier) {
+	public TslInfosImpl(String country, String tslServiceTypeStatus, String tslServiceTypeIdentifier, 
+			List<URI> tslCertificateQualifier, List<String> additionalServiceInformation) {
 		this.tslCountry = country;
 		this.tslServiceTypeStatus = tslServiceTypeStatus;
 		this.tslServiceTypeIdentifier = tslServiceTypeIdentifier;
 		
-		for (URI el : tslCertificateQualifier)
-			this.tslServiceQualifier.add(el.toString());
+		if (tslCertificateQualifier != null) {
+			for (URI el : tslCertificateQualifier)
+				this.tslServiceQualifier.add(el.toString());
 			
+		}
+		
+		if (additionalServiceInformation != null)
+			this.tslAdditionalServiceInformation.addAll(additionalServiceInformation);
 		
 	}
 	
@@ -45,4 +52,11 @@ public class TslInfosImpl implements TslInfos {
 		return tslServiceQualifier;
 	}
 
+
+	@Override
+	public List<String> getAdditionalServiceInformation() {
+		return this.tslAdditionalServiceInformation;
+		
+	}
+
 }