Update CM to us Local Intermediate Certs

[aaf/authz.git] / auth / auth-certman / src / main / java / org / onap / aaf / auth / cm / cert / RDN.java

diff --git a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/cert/RDN.java b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/cert/RDN.java
index 7d4161f..564a4b5 100644 (file)
--- a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/cert/RDN.java
+++ b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/cert/RDN.java
@@ -25,7 +25,7 @@ import java.util.List;
 
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.x500.style.BCStyle;
-import org.onap.aaf.cadi.cm.CertException;
+import org.onap.aaf.cadi.configure.CertException;
 import org.onap.aaf.cadi.util.Split;
 
 public class RDN {
@@ -52,7 +52,7 @@ public class RDN {
                        case "generationQualifier":     aoi = BCStyle.GENERATION; break;
                        case "serialNumber":                    aoi = BCStyle.SERIALNUMBER; break;
                        default:
-                               throw new CertException("Unknown ASN1ObjectIdentifier for " + tv[0]);
+                               throw new CertException("Unknown ASN1ObjectIdentifier for " + tv[0] + " in " + tagValue);
                }
                tag = tv[0];
                value = tv[1];
@@ -81,8 +81,10 @@ public class RDN {
                                if('"' == c) {
                                        inQuotes=true;
                                } else if(delim==c) {
-                                       lrnd.add(new RDN(sb.toString()));
-                                       sb.setLength(0);
+                                       if(sb.length()>0) {
+                                               lrnd.add(new RDN(sb.toString()));
+                                               sb.setLength(0);
+                                       }
                                } else {
                                        sb.append(dnString.charAt(i));
                                }