diff options
Diffstat (limited to 'pki/base/common/src/com/netscape/cmscore/connector/LocalConnector.java')
-rw-r--r-- | pki/base/common/src/com/netscape/cmscore/connector/LocalConnector.java | 45 |
1 files changed, 21 insertions, 24 deletions
diff --git a/pki/base/common/src/com/netscape/cmscore/connector/LocalConnector.java b/pki/base/common/src/com/netscape/cmscore/connector/LocalConnector.java index 9272cc93f..da639c0b1 100644 --- a/pki/base/common/src/com/netscape/cmscore/connector/LocalConnector.java +++ b/pki/base/common/src/com/netscape/cmscore/connector/LocalConnector.java @@ -17,7 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmscore.connector; - import java.util.Hashtable; import com.netscape.certsrv.apps.CMS; @@ -36,7 +35,6 @@ import com.netscape.certsrv.request.RequestId; import com.netscape.certsrv.request.RequestStatus; import com.netscape.cmscore.util.Debug; - public class LocalConnector implements IConnector { ILogger mLogger = CMS.getLogger(); ICertAuthority mSource = null; @@ -49,7 +47,7 @@ public class LocalConnector implements IConnector { // mSource.getId()); mDest = dest; CMS.debug("Local connector setup for dest " + - mDest.getId()); + mDest.getId()); // register for events. mDest.registerRequestListener(new LocalConnListener()); CMS.debug("Connector inited"); @@ -64,27 +62,27 @@ public class LocalConnector implements IConnector { Debug.print("send request type " + r.getRequestType() + " status=" + r.getRequestStatus() + " to " + mDest.getId() + " id=" + r.getRequestId() + "\n"); } CMS.debug("send request type " + r.getRequestType() + - " to " + mDest.getId()); + " to " + mDest.getId()); IRequestQueue destQ = mDest.getRequestQueue(); IRequest destreq = destQ.newRequest(r.getRequestType()); CMS.debug("local connector dest req " + - destreq.getRequestId() + " created for source rId " + r.getRequestId()); + destreq.getRequestId() + " created for source rId " + r.getRequestId()); // mSource.log(ILogger.LL_DEBUG, // "setting connector dest " + mDest.getId() + // " source id to " + r.getRequestId()); // XXX set context to the real identity later. destreq.setSourceId( - mSource.getX500Name().toString() + ":" + r.getRequestId().toString()); + mSource.getX500Name().toString() + ":" + r.getRequestId().toString()); //destreq.copyContents(r); // copy meta attributes in request. transferRequest(r, destreq); // XXX requestor type is not transferred on return. destreq.setExtData(IRequest.REQUESTOR_TYPE, - IRequest.REQUESTOR_RA); + IRequest.REQUESTOR_RA); CMS.debug("connector dest " + mDest.getId() + - " processing " + destreq.getRequestId()); + " processing " + destreq.getRequestId()); // set context before calling process request so // that request subsystem can record the creator @@ -111,8 +109,8 @@ public class LocalConnector implements IConnector { } CMS.debug("connector dest " + mDest.getId() + - " processed " + destreq.getRequestId() + - " status " + destreq.getRequestStatus()); + " processed " + destreq.getRequestId() + + " status " + destreq.getRequestStatus()); if (destreq.getRequestStatus() == RequestStatus.COMPLETE) { // no need to transfer contents if request wasn't complete. @@ -126,7 +124,7 @@ public class LocalConnector implements IConnector { public class LocalConnListener implements IRequestListener { public void init(ISubsystem sys, IConfigStore config) - throws EBaseException { + throws EBaseException { } public void set(String name, String val) { @@ -136,8 +134,8 @@ public class LocalConnector implements IConnector { if (Debug.ON) { Debug.print("dest " + mDest.getId() + " done with " + destreq.getRequestId()); } - CMS.debug( - "dest " + mDest.getId() + " done with " + destreq.getRequestId()); + CMS.debug( + "dest " + mDest.getId() + " done with " + destreq.getRequestId()); IRequestQueue sourceQ = mSource.getRequestQueue(); // accept requests that only belong to us. @@ -146,19 +144,19 @@ public class LocalConnector implements IConnector { String sourceNameAndId = destreq.getSourceId(); String sourceName = mSource.getX500Name().toString(); - if (sourceNameAndId == null || - !sourceNameAndId.toString().regionMatches(0, - sourceName, 0, sourceName.length())) { + if (sourceNameAndId == null || + !sourceNameAndId.toString().regionMatches(0, + sourceName, 0, sourceName.length())) { CMS.debug("request " + destreq.getRequestId() + - " from " + sourceNameAndId + " not ours."); + " from " + sourceNameAndId + " not ours."); return; } int index = sourceNameAndId.lastIndexOf(':'); if (index == -1) { - mSource.log(ILogger.LL_FAILURE, - "request " + destreq.getRequestId() + - " for " + sourceNameAndId + " malformed."); + mSource.log(ILogger.LL_FAILURE, + "request " + destreq.getRequestId() + + " for " + sourceNameAndId + " malformed."); return; } String sourceId = sourceNameAndId.substring(index + 1); @@ -187,9 +185,9 @@ public class LocalConnector implements IConnector { r = (IRequest) mSourceReqs.get(rId); if (r != null) { if (r.getRequestStatus() != RequestStatus.SVC_PENDING) { - mSource.log(ILogger.LL_FAILURE, - "request state of " + rId + "not pending " + - " from dest authority " + mDest.getId()); + mSource.log(ILogger.LL_FAILURE, + "request state of " + rId + "not pending " + + " from dest authority " + mDest.getId()); sourceQ.releaseRequest(r); return; } @@ -209,4 +207,3 @@ public class LocalConnector implements IConnector { RequestTransfer.transfer(src, dest); } } - |