summaryrefslogtreecommitdiffstats
path: root/base/common/src/com/netscape/cmscore/ldap
diff options
context:
space:
mode:
Diffstat (limited to 'base/common/src/com/netscape/cmscore/ldap')
-rw-r--r--base/common/src/com/netscape/cmscore/ldap/LdapRule.java31
-rw-r--r--base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java29
2 files changed, 32 insertions, 28 deletions
diff --git a/base/common/src/com/netscape/cmscore/ldap/LdapRule.java b/base/common/src/com/netscape/cmscore/ldap/LdapRule.java
index f5fdcc502..eaf5e763a 100644
--- a/base/common/src/com/netscape/cmscore/ldap/LdapRule.java
+++ b/base/common/src/com/netscape/cmscore/ldap/LdapRule.java
@@ -66,28 +66,28 @@ public class LdapRule implements ILdapRule, IExtendedPluginInfo {
mProcessor = processor;
Enumeration<String> mappers = mProcessor.getMapperInsts().keys();
Enumeration<String> publishers = mProcessor.getPublisherInsts().keys();
-
- String map = NOMAPPER;
+ StringBuffer map=new StringBuffer();
+ map.append(NOMAPPER);
for (; mappers.hasMoreElements();) {
String name = mappers.nextElement();
- map = map + "," + name;
+ map.append(",").append(name);
}
- String publish = "";
+ StringBuffer publish = new StringBuffer();
for (; publishers.hasMoreElements();) {
String name = publishers.nextElement();
- publish = publish + "," + name;
+ publish.append(",").append(name);
}
epi_params = new String[] {
"type;choice(cacert,crl, certs);The publishing object type",
"mapper;choice("
- + map + ");Use the mapper to find the ldap dn \nto publish the certificate or crl",
+ + map.toString() + ");Use the mapper to find the ldap dn \nto publish the certificate or crl",
"publisher;choice("
- + publish + ");Use the publisher to publish the certificate or crl a directory etc",
+ + publish.toString() + ");Use the publisher to publish the certificate or crl a directory etc",
"enable;boolean;Enable this publishing rule",
"predicate;string;Filter describing when this publishing rule shoule be used"
};
@@ -171,22 +171,27 @@ public class LdapRule implements ILdapRule, IExtendedPluginInfo {
public Vector<String> getInstanceParams() {
//if (mProcessor == null) System.out.println("xxxxnull");
//dont know why the processor was null in getExtendedPluginInfo()
- Enumeration<String> mappers = mProcessor.getMapperInsts().keys();
+
+ /* Commented block contains variables which are used only in the below commented block.
+ *
+ * Enumeration<String> mappers = mProcessor.getMapperInsts().keys();
Enumeration<String> publishers = mProcessor.getPublisherInsts().keys();
- String map = NOMAPPER;
+ StringBuffer map=new StringBuffer();
+ map.append(NOMAPPER);
for (; mappers.hasMoreElements();) {
String name = mappers.nextElement();
- map = map + "," + name;
+ map.append(",").append(name);
}
- String publish = "";
+ StringBuffer publish=new StringBuffer();
+
for (; publishers.hasMoreElements();) {
String name = publishers.nextElement();
- publish = publish + "," + name;
- }
+ publish.append(",").append(name);
+ }*/
/*
mExtendedPluginInfo = new NameValuePairs();
diff --git a/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java b/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java
index 1314899b7..e5aef45a5 100644
--- a/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java
+++ b/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java
@@ -837,7 +837,7 @@ public class PublisherProcessor implements
public void publishCACert(X509Certificate cert)
throws ELdapException {
boolean error = false;
- String errorRule = "";
+ StringBuffer errorRule = new StringBuffer();
if (!enabled())
return;
@@ -889,15 +889,14 @@ public class PublisherProcessor implements
//log(ILogger.LL_WARN, e.toString());
CMS.debug("PublisherProcessor::publishCACert returned error: " + e);
error = true;
- errorRule = errorRule + " " + rule.getInstanceName() +
- " error:" + e;
+ errorRule.append(" " + rule.getInstanceName() + " error:" + e);
}
}
// set the ldap published flag.
if (!error) {
setPublishedFlag(cert.getSerialNumber(), true);
} else {
- throw new ELdapException(CMS.getUserMessage("CMS_LDAP_PUBLISH_FAILED", errorRule));
+ throw new ELdapException(CMS.getUserMessage("CMS_LDAP_PUBLISH_FAILED", errorRule.toString()));
}
}
@@ -908,7 +907,7 @@ public class PublisherProcessor implements
public void unpublishCACert(X509Certificate cert)
throws ELdapException {
boolean error = false;
- String errorRule = "";
+ StringBuffer errorRule = new StringBuffer();
if (!enabled())
return;
@@ -956,7 +955,7 @@ public class PublisherProcessor implements
// continue publishing even publisher has errors
//log(ILogger.LL_WARN, e.toString());
error = true;
- errorRule = errorRule + " " + rule.getInstanceName();
+ errorRule.append(" ").append(rule.getInstanceName());
}
}
@@ -964,7 +963,7 @@ public class PublisherProcessor implements
if (!error) {
setPublishedFlag(cert.getSerialNumber(), false);
} else {
- throw new ELdapException(CMS.getUserMessage("CMS_LDAP_UNPUBLISH_FAILED", errorRule));
+ throw new ELdapException(CMS.getUserMessage("CMS_LDAP_UNPUBLISH_FAILED", errorRule.toString()));
}
}
@@ -1034,7 +1033,7 @@ public class PublisherProcessor implements
public void publishCert(X509Certificate cert, IRequest req)
throws ELdapException {
boolean error = false;
- String errorRule = "";
+ StringBuffer errorRule = new StringBuffer();
CMS.debug("In PublisherProcessor::publishCert");
if (!enabled())
@@ -1048,7 +1047,7 @@ public class PublisherProcessor implements
CMS.debug("Publishing: can't find publishing rule,exiting routine.");
error = true;
- errorRule = "No rules enabled";
+ errorRule.append("No rules enabled");
}
while (rules != null && rules.hasMoreElements()) {
@@ -1073,15 +1072,15 @@ public class PublisherProcessor implements
// continue publishing even publisher has errors
//log(ILogger.LL_WARN, e.toString());
error = true;
- errorRule = errorRule + " " + rule.getInstanceName();
+ errorRule.append(" ").append(rule.getInstanceName());
}
}
// set the ldap published flag.
if (!error) {
setPublishedFlag(cert.getSerialNumber(), true);
} else {
- CMS.debug("PublishProcessor::publishCert : " + CMS.getUserMessage("CMS_LDAP_PUBLISH_FAILED", errorRule));
- throw new ELdapException(CMS.getUserMessage("CMS_LDAP_PUBLISH_FAILED", errorRule));
+ CMS.debug("PublishProcessor::publishCert : " + CMS.getUserMessage("CMS_LDAP_PUBLISH_FAILED", errorRule.toString()));
+ throw new ELdapException(CMS.getUserMessage("CMS_LDAP_PUBLISH_FAILED", errorRule.toString()));
}
}
@@ -1092,7 +1091,7 @@ public class PublisherProcessor implements
public void unpublishCert(X509Certificate cert, IRequest req)
throws ELdapException {
boolean error = false;
- String errorRule = "";
+ StringBuffer errorRule = new StringBuffer();
if (!enabled())
return;
@@ -1139,7 +1138,7 @@ public class PublisherProcessor implements
// continue publishing even publisher has errors
//log(ILogger.LL_WARN, e.toString());
error = true;
- errorRule = errorRule + " " + rule.getInstanceName();
+ errorRule.append(" ").append(rule.getInstanceName());
}
}
@@ -1147,7 +1146,7 @@ public class PublisherProcessor implements
if (!error) {
setPublishedFlag(cert.getSerialNumber(), false);
} else {
- throw new ELdapException(CMS.getUserMessage("CMS_LDAP_UNPUBLISH_FAILED", errorRule));
+ throw new ELdapException(CMS.getUserMessage("CMS_LDAP_UNPUBLISH_FAILED", errorRule.toString()));
}
}
generated by cgit (git 2.34.1) at 2024-05-27 11:02:32 +0000