Check Perm Instance ending in colon

[aaf/authz.git] / cadi / aaf / src / main / java / org / onap / aaf / cadi / cm / PlaceArtifactInKeystore.java

diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInKeystore.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInKeystore.java
index a4d095e..2b498d4 100644 (file)
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInKeystore.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInKeystore.java
@@ -41,12 +41,6 @@ import certman.v1_0.CertInfo;
 
 public class PlaceArtifactInKeystore extends ArtifactDir {
        private String kst;
-       //TODO get ROOT DNs or Trusted DNs from Certificate Manager.
-//     private static String[] rootDNs = new String[]{                 
-//                     "CN=ATT CADI Root CA - Test, O=ATT, OU=CSO, C=US", // Lab.  delete eventually
-//                     "CN=ATT AAF CADI TEST CA, OU=CSO, O=ATT, C=US",
-//                     "CN=ATT AAF CADI CA, OU=CSO, O=ATT, C=US"
-//     };
 
        public PlaceArtifactInKeystore(String kst) {
                this.kst = kst;
@@ -131,17 +125,16 @@ public class PlaceArtifactInKeystore extends ArtifactDir {
                        char[] truststorePassArray = trustStorePass.toCharArray();
                        jks.load(null,truststorePassArray); // load in
                        
-                       // Add Trusted Certificates
+                       // Add Trusted Certificates, but PKCS12 doesn't support
                        for(int i=0; i<trustCAs.length;++i) {
                                jks.setCertificateEntry("ca_" + arti.getCa() + '_' + i, trustCAs[i]);
                        }
                        // Write out
                        write(fks,Chmod.to644,jks,truststorePassArray);
-
+                       return true;
                } catch (Exception e) {
                        throw new CadiException(e);
                }
-               return false;
        }
 
 }