Code Review
/
aaf
/
authz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove Tabs, per Jococo
[aaf/authz.git]
/
cadi
/
aaf
/
src
/
main
/
java
/
org
/
onap
/
aaf
/
cadi
/
configure
/
PlaceArtifactInKeystore.java
diff --git
a/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PlaceArtifactInKeystore.java
b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PlaceArtifactInKeystore.java
index
67b3df0
..
18d74fb
100644
(file)
--- a/
cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PlaceArtifactInKeystore.java
+++ b/
cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PlaceArtifactInKeystore.java
@@
-50,7
+50,7
@@
public class PlaceArtifactInKeystore extends ArtifactDir {
@Override
public boolean _place(Trans trans, CertInfo certInfo, Artifact arti) throws CadiException {
@Override
public boolean _place(Trans trans, CertInfo certInfo, Artifact arti) throws CadiException {
- final String ext = (kst==Agent.PKCS12?"p12":kst);
+
final String ext = (kst==Agent.PKCS12?"p12":kst);
File fks = new File(dir,arti.getNs()+'.'+ext);
try {
KeyStore jks = KeyStore.getInstance(kst);
File fks = new File(dir,arti.getNs()+'.'+ext);
try {
KeyStore jks = KeyStore.getInstance(kst);
@@
-73,17
+73,17
@@
public class PlaceArtifactInKeystore extends ArtifactDir {
if (x509.getSubjectDN().equals(x509.getIssuerDN())) {
caSet.add(x509);
} else {
if (x509.getSubjectDN().equals(x509.getIssuerDN())) {
caSet.add(x509);
} else {
-
// Expect Certs in Trust Chain Order.
-
if(curr==null) {
+ // Expect Certs in Trust Chain Order.
+ if(curr==null) {
chainList.add(x509);
curr=x509;
chainList.add(x509);
curr=x509;
-
} else {
- // Only Add Cert next on the list
-
if(curr.getIssuerDN().equals(x509.getSubjectDN())) {
-
chainList.add(x509);
-
curr=x509;
-
}
-
}
+ } else {
+
// Only Add Cert next on the list
+ if(curr.getIssuerDN().equals(x509.getSubjectDN())) {
+ chainList.add(x509);
+ curr=x509;
+ }
+ }
}
}
}
}