From 500fe4441a5d458818138cc9b536c3b19ac23dc8 Mon Sep 17 00:00:00 2001 From: Abhishek Koneru Date: Tue, 29 May 2012 14:53:35 -0400 Subject: Patch with fixes for review comments 0529 --- base/common/src/com/netscape/cmscore/connector/Resender.java | 4 +++- base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'base/common/src/com/netscape') 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( -- cgit