improvements for ognl

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@641 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c

1 files changed, 21 insertions, 7 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/SignSignatureObject.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/SignSignatureObject.java
index d4bc0e2..f857fb0 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/SignSignatureObject.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/SignSignatureObject.java
@@ -172,14 +172,19 @@ public class SignSignatureObject implements Serializable, MandatorySignatureInfo
   // dferbas

   

   

+  public Map getSubjectDNMap() {

+     if (this.subjectDNMap.size() == 0) {

+        if (this.getX509Certificate() != null) {         

+           fillDNMap(this.getX509Certificate().getSubjectX500Principal().getName(), this.subjectDNMap);

+        }

+     }

+     return this.subjectDNMap;

+     

+  }

   

    public String certSubjectDNPart(String key) {      

-      if (this.subjectDNMap.size() == 0) {

-         if (this.getX509Certificate() != null) {         

-            fillDNMap(this.getX509Certificate().getSubjectX500Principal().getName(), this.subjectDNMap);

-         }

-      }

-      return (String)this.subjectDNMap.get(key);

+

+      return (String)this.getSubjectDNMap().get(key);

    }

    

 

@@ -191,6 +196,15 @@ public class SignSignatureObject implements Serializable, MandatorySignatureInfo
    public String getSigTimeStamp() {

       return this.sigTimeStamp;

    }

+   

+   public Map getIssuerDNMap() {

+      if (this.issuerDNMap.size() == 0) {

+         if (this.getX509Certificate() != null) {         

+            fillDNMap(this.getX509Certificate().getIssuerX500Principal().getName(), this.issuerDNMap);

+         }

+      }

+      return this.issuerDNMap;

+   }

 

    public String certIssuerDNPart(String key) {      

       if (this.issuerDNMap.size() == 0) {

@@ -198,7 +212,7 @@ public class SignSignatureObject implements Serializable, MandatorySignatureInfo
             fillDNMap(this.getX509Certificate().getIssuerX500Principal().getName(), this.issuerDNMap);

          }

       }

-      return (String)this.issuerDNMap.get(key);

+      return (String)this.getIssuerDNMap().get(key);

    }

    

    private void fillDNMap(String dn, Map dnMap) {