summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--base/common/src/com/netscape/cmscore/connector/Resender.java4
-rw-r--r--base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java3
-rw-r--r--base/silent/src/com/netscape/pkisilent/common/Request.java4
-rw-r--r--base/util/src/netscape/security/extensions/GenericASN1Extension.java2
-rw-r--r--base/util/src/netscape/security/pkcs/PKCS7.java2
5 files changed, 7 insertions, 8 deletions
diff --git a/base/common/src/com/netscape/cmscore/connector/Resender.java b/base/common/src/com/netscape/cmscore/connector/Resender.java
index 73a399fdc..e1b19749a 100644
--- a/base/common/src/com/netscape/cmscore/connector/Resender.java
+++ b/base/common/src/com/netscape/cmscore/connector/Resender.java
@@ -216,9 +216,11 @@ public class Resender implements IResender {
RequestStatus replyStatus =
RequestStatus.fromString(replymsg.reqStatus);
int index = replymsg.reqId.lastIndexOf(':');
+ RequestId replyRequestId =
+ new RequestId(replymsg.reqId.substring(index + 1));
if (Debug.ON)
- Debug.trace("reply request id " + replymsg.reqId.substring(index + 1) +
+ Debug.trace("reply request id " + replyRequestId +
" for request " + r.getRequestId());
if (replyStatus != RequestStatus.COMPLETE) {
diff --git a/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java b/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java
index 6f5d29730..c44476dd6 100644
--- a/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java
+++ b/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java
@@ -1247,8 +1247,7 @@ public class SelfTestSubsystem
*/
public void setId(String id)
throws EBaseException {
- // strip preceding/trailing whitespace
- // from passed-in String parameters
+
if (id == null) {
log(mLogger,
CMS.getLogMessage(
diff --git a/base/silent/src/com/netscape/pkisilent/common/Request.java b/base/silent/src/com/netscape/pkisilent/common/Request.java
index 978426c50..4557f2f65 100644
--- a/base/silent/src/com/netscape/pkisilent/common/Request.java
+++ b/base/silent/src/com/netscape/pkisilent/common/Request.java
@@ -664,9 +664,7 @@ public class Request extends TestClient {
con.setQueryString(query);
con.setActionURL(ACTION_STRING);
con.Send();
- StringBuffer s;
-
- s = con.getPage();
+ StringBuffer s = con.getPage();
if (debug) {
System.out.println(s.toString());
diff --git a/base/util/src/netscape/security/extensions/GenericASN1Extension.java b/base/util/src/netscape/security/extensions/GenericASN1Extension.java
index 80617869c..78d294573 100644
--- a/base/util/src/netscape/security/extensions/GenericASN1Extension.java
+++ b/base/util/src/netscape/security/extensions/GenericASN1Extension.java
@@ -272,7 +272,7 @@ public class GenericASN1Extension extends Extension
*/
@Override
public String toString() {
- return super.toString();
+ return (null);
}
/**
diff --git a/base/util/src/netscape/security/pkcs/PKCS7.java b/base/util/src/netscape/security/pkcs/PKCS7.java
index 4ecb2966c..4bedc06fe 100644
--- a/base/util/src/netscape/security/pkcs/PKCS7.java
+++ b/base/util/src/netscape/security/pkcs/PKCS7.java
@@ -72,7 +72,7 @@ public class PKCS7 {
int len = 0;
byte[] newbuf = new byte[len];
byte[] oldbuf = new byte[len];
- byte[] data;
+ byte[] data = new byte[len];
do {
newbuf = new byte[dis.available()];