summaryrefslogtreecommitdiffstats
path: root/base/common/src/com/netscape/cmscore/connector
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2012-04-05 14:49:11 -0500
committerEndi Sukma Dewata <edewata@redhat.com>2012-04-09 10:03:25 -0500
commit7c7b9d023cd466c1771068badc020dab36beb553 (patch)
tree178877eb83e25336be7577953945fbdb0b9e1a15 /base/common/src/com/netscape/cmscore/connector
parentda1e6e2f49f66fd46c8039ff1aa4386309fba8f4 (diff)
downloadpki-7c7b9d023cd466c1771068badc020dab36beb553.tar.gz
pki-7c7b9d023cd466c1771068badc020dab36beb553.tar.xz
pki-7c7b9d023cd466c1771068badc020dab36beb553.zip
Removed whitespaces from Java code.
Whitespaces in Java code have been removed with the following command: find . -not -path .git -name *.java -exec sed -i 's/[[:blank:]]\+$//' {} \; Ticket #134
Diffstat (limited to 'base/common/src/com/netscape/cmscore/connector')
-rw-r--r--base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java12
-rw-r--r--base/common/src/com/netscape/cmscore/connector/HttpConnection.java8
-rw-r--r--base/common/src/com/netscape/cmscore/connector/HttpConnector.java10
-rw-r--r--base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java4
-rw-r--r--base/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java2
-rw-r--r--base/common/src/com/netscape/cmscore/connector/LocalConnector.java14
-rw-r--r--base/common/src/com/netscape/cmscore/connector/Resender.java8
7 files changed, 29 insertions, 29 deletions
diff --git a/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java b/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java
index 01bb0f879..2d8c98ee4 100644
--- a/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java
+++ b/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java
@@ -37,7 +37,7 @@ public class HttpConnFactory {
private ILogger mLogger = CMS.getLogger();
private int mNumConns = 0; // number of available conns in array
- private int mTotal = 0; // total num conns
+ private int mTotal = 0; // total num conns
private IHttpConnection mMasterConn = null; // master connection object.
private IHttpConnection mConns[];
private IAuthority mSource = null;
@@ -59,7 +59,7 @@ public class HttpConnFactory {
/**
* Constructor for HttpConnFactory
- *
+ *
* @param minConns minimum number of connections to have available
* @param maxConns max number of connections to have available. This is
* @param serverInfo server connection info - host, port, etc.
@@ -79,7 +79,7 @@ public class HttpConnFactory {
/**
* initialize parameters obtained from either constructor or
* config store
- *
+ *
* @param minConns minimum number of connection handls to have available.
* @param maxConns maximum total number of connections to ever have.
* @param connInfo ldap connection info.
@@ -177,7 +177,7 @@ public class HttpConnFactory {
* returnConn() method.
* The best thing to do is to put returnConn in a finally clause so it
* always gets called. For example,
- *
+ *
* <pre>
* IHttpConnection c = null;
* try {
@@ -204,7 +204,7 @@ public class HttpConnFactory {
* Returns null if maximum number of connections reached.
* The best thing to do is to put returnConn in a finally clause so it
* always gets called. For example,
- *
+ *
* <pre>
* IHttpConnnection c = null;
* try {
@@ -260,7 +260,7 @@ public class HttpConnFactory {
* This is mandatory after a getConn().
* The best thing to do is to put returnConn in a finally clause so it
* always gets called. For example,
- *
+ *
* <pre>
* IHttpConnection c = null;
* try {
diff --git a/base/common/src/com/netscape/cmscore/connector/HttpConnection.java b/base/common/src/com/netscape/cmscore/connector/HttpConnection.java
index 95cdbc779..7a65c1760 100644
--- a/base/common/src/com/netscape/cmscore/connector/HttpConnection.java
+++ b/base/common/src/com/netscape/cmscore/connector/HttpConnection.java
@@ -73,7 +73,7 @@ public class HttpConnection implements IHttpConnection {
CMS.debug("HttpConnection: connecting to " + dest.getHost() + ":" + dest.getPort());
String host = dest.getHost();
// we could have a list of host names in the host parameters
- // the format is, for example,
+ // the format is, for example,
// "directory.knowledge.com:1050 people.catalog.com 199.254.1.2"
if (host != null && host.indexOf(' ') != -1) {
// try to do client-side failover
@@ -116,7 +116,7 @@ public class HttpConnection implements IHttpConnection {
// Insert end
/**
* sends a request to remote RA/CA, returning the result.
- *
+ *
* @throws EBaseException if request could not be encoded
*/
public IPKIMessage send(IPKIMessage tomsg)
@@ -222,8 +222,8 @@ public class HttpConnection implements IHttpConnection {
}
}
- // decode reply.
- // if reply is bad, error is thrown and request will be resent
+ // decode reply.
+ // if reply is bad, error is thrown and request will be resent
String pcontent = p.getContent();
if (Debug.ON) {
diff --git a/base/common/src/com/netscape/cmscore/connector/HttpConnector.java b/base/common/src/com/netscape/cmscore/connector/HttpConnector.java
index cdb315795..90979f870 100644
--- a/base/common/src/com/netscape/cmscore/connector/HttpConnector.java
+++ b/base/common/src/com/netscape/cmscore/connector/HttpConnector.java
@@ -70,7 +70,7 @@ public class HttpConnector implements IConnector {
}
// mConn = CMS.getHttpConnection(dest, mFactory);
- // this will start resending past requests in parallel.
+ // this will start resending past requests in parallel.
mResender = CMS.getResender(mSource, nickName, dest, resendInterval);
mResendThread = new Thread(mResender, "HttpConnector");
}
@@ -95,7 +95,7 @@ public class HttpConnector implements IConnector {
CMS.debug("can't create new HttpConnFactory");
}
- // this will start resending past requests in parallel.
+ // this will start resending past requests in parallel.
mResender = CMS.getResender(mSource, nickName, dest, resendInterval);
mResendThread = new Thread(mResender, "HttpConnector");
}
@@ -140,7 +140,7 @@ public class HttpConnector implements IConnector {
CMS.debug("reply status " + replyStatus);
// non terminal states.
- // XXX hack: don't resend get revocation info requests since
+ // XXX hack: don't resend get revocation info requests since
// resent results are ignored.
if ((!r.getRequestType().equals(
IRequest.GETREVOCATIONINFO_REQUEST)) &&
@@ -169,7 +169,7 @@ public class HttpConnector implements IConnector {
r.setExtData(IRequest.RESULT, IRequest.RES_ERROR);
r.setExtData(IRequest.ERROR,
new EBaseException(CMS.getUserMessage("CMS_BASE_REMOTE_AUTHORITY_ERROR")));
- // XXX overload svcerrors for now.
+ // XXX overload svcerrors for now.
Vector<String> policyErrors = r.getExtDataInStringVector(IRequest.ERRORS);
if (policyErrors != null && policyErrors.size() > 0) {
@@ -189,7 +189,7 @@ public class HttpConnector implements IConnector {
CMS.debug("HttpConn: error sending request to cert " + e.toString());
mSource.log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_CONNECTOR_SEND_REQUEST", r.getRequestId()
.toString(), mDest.getHost(), Integer.toString(mDest.getPort())));
- // mSource.log(ILogger.LL_INFO,
+ // mSource.log(ILogger.LL_INFO,
// "Queing " + r.getRequestId() + " for resend.");
return false;
} finally {
diff --git a/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java b/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java
index ea235391d..ddf23378a 100644
--- a/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java
+++ b/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java
@@ -64,7 +64,7 @@ public class HttpPKIMessage implements IHttpPKIMessage {
* copy contents of request to make a simple name/value message.
*/
public void fromRequest(IRequest r) {
- // actually don't need to copy source id since
+ // actually don't need to copy source id since
reqType = r.getRequestType();
reqId = r.getRequestId().toString();
reqStatus = r.getRequestStatus().toString();
@@ -96,7 +96,7 @@ public class HttpPKIMessage implements IHttpPKIMessage {
*/
@SuppressWarnings("unchecked")
public void toRequest(IRequest r) {
- // id, type and status
+ // id, type and status
// type had to have been set in instantiation.
// id is checked but not reset.
// request status cannot be set, but can be looked at.
diff --git a/base/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java b/base/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java
index 76d39b3ed..bb18030dc 100644
--- a/base/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java
+++ b/base/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java
@@ -58,7 +58,7 @@ public class HttpRequestEncoder implements IRequestEncoder {
result = is.readObject();
} catch (ClassNotFoundException e) {
- // XXX hack: change this
+ // XXX hack: change this
if (Debug.ON)
Debug.trace("class not found ex " + e + e.getMessage());
throw new IOException("Class Not Found " + e.getMessage());
diff --git a/base/common/src/com/netscape/cmscore/connector/LocalConnector.java b/base/common/src/com/netscape/cmscore/connector/LocalConnector.java
index 42c6636ce..9c4825494 100644
--- a/base/common/src/com/netscape/cmscore/connector/LocalConnector.java
+++ b/base/common/src/com/netscape/cmscore/connector/LocalConnector.java
@@ -71,11 +71,11 @@ public class LocalConnector implements IConnector {
CMS.debug("local connector dest req " +
destreq.getRequestId() + " created for source rId " + r.getRequestId());
- // mSource.log(ILogger.LL_DEBUG,
+ // mSource.log(ILogger.LL_DEBUG,
// "setting connector dest " + mDest.getId() +
// " source id to " + r.getRequestId());
- // XXX set context to the real identity later.
+ // XXX set context to the real identity later.
destreq.setSourceId(
mSource.getX500Name().toString() + ":" + r.getRequestId().toString());
//destreq.copyContents(r); // copy meta attributes in request.
@@ -98,7 +98,7 @@ public class LocalConnector implements IConnector {
}
// Locally cache the source request so that we
- // can update it when the dest request is
+ // can update it when the dest request is
// processed (when LocalConnListener is being called).
mSourceReqs.put(r.getRequestId().toString(), r);
try {
@@ -140,9 +140,9 @@ public class LocalConnector implements IConnector {
"dest " + mDest.getId() + " done with " + destreq.getRequestId());
IRequestQueue sourceQ = mSource.getRequestQueue();
- // accept requests that only belong to us.
+ // accept requests that only belong to us.
// XXX review death scenarios here. - If system dies anywhere
- // here need to check all requests at next server startup.
+ // here need to check all requests at next server startup.
String sourceNameAndId = destreq.getSourceId();
String sourceName = mSource.getX500Name().toString();
@@ -174,7 +174,7 @@ public class LocalConnector implements IConnector {
// performance enhancement, approved request will
// not be immediately available in the database. So
// retrieving the request from the queue within
- // the serviceRequest() function will have
+ // the serviceRequest() function will have
// diffculities.
// You may wonder what happen if the system crashes
// during the request servicing. Yes, the request
@@ -182,7 +182,7 @@ public class LocalConnector implements IConnector {
// resubmit their requests again.
// Note that the pending requests, on the other hand,
// are persistent before the servicing.
- // Please see stateEngine() function in
+ // Please see stateEngine() function in
// ARequestQueue.java for details.
r = mSourceReqs.get(rId);
if (r != null) {
diff --git a/base/common/src/com/netscape/cmscore/connector/Resender.java b/base/common/src/com/netscape/cmscore/connector/Resender.java
index 783caa671..e1b19749a 100644
--- a/base/common/src/com/netscape/cmscore/connector/Resender.java
+++ b/base/common/src/com/netscape/cmscore/connector/Resender.java
@@ -67,7 +67,7 @@ public class Resender implements IResender {
mDest = dest;
mNickName = nickName;
- //mConn = new HttpConnection(dest,
+ //mConn = new HttpConnection(dest,
// new JssSSLSocketFactory(nickName));
}
@@ -80,7 +80,7 @@ public class Resender implements IResender {
if (interval > 0)
mInterval = interval * SECOND; // interval specified in seconds.
- //mConn = new HttpConnection(dest,
+ //mConn = new HttpConnection(dest,
// new JssSSLSocketFactory(nickName));
}
@@ -96,7 +96,7 @@ public class Resender implements IResender {
CMS.debug(
"added request Id " + rid + " in init to resend queue.");
- // note these are added as strings
+ // note these are added as strings
mRequestIds.addElement(rid.toString());
}
}
@@ -149,7 +149,7 @@ public class Resender implements IResender {
try {
r = mQueue.findRequest(rid);
} catch (EBaseException e) {
- // XXX bad case. should we remove the rid now ?
+ // XXX bad case. should we remove the rid now ?
mAuthority.log(ILogger.LL_WARN,
CMS.getLogMessage("CMSCORE_CONNECTOR_REQUEST_NOT_FOUND", rid.toString()));
continue;