diff options
author | Endi Sukma Dewata <edewata@redhat.com> | 2012-04-05 14:49:11 -0500 |
---|---|---|
committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-04-09 10:03:25 -0500 |
commit | 7c7b9d023cd466c1771068badc020dab36beb553 (patch) | |
tree | 178877eb83e25336be7577953945fbdb0b9e1a15 /base/common/src/com/netscape/cmscore/ldapconn | |
parent | da1e6e2f49f66fd46c8039ff1aa4386309fba8f4 (diff) | |
download | pki-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/ldapconn')
6 files changed, 27 insertions, 27 deletions
diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java index dc4c86547..1edee3812 100644 --- a/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java +++ b/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java @@ -48,7 +48,7 @@ public class LdapAnonConnFactory implements ILdapConnFactory { public static final String PROP_ERROR_IF_DOWN = "errorIfDown"; 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 AnonConnection mConns[] = null; private boolean mInited = false; @@ -69,7 +69,7 @@ public class LdapAnonConnFactory implements ILdapConnFactory { /** * Constructor for LdapAnonConnFactory - * + * * @param minConns minimum number of connections to have available * @param maxConns max number of connections to have available. This is * the maximum number of clones of this connection one wants to allow. @@ -135,7 +135,7 @@ public class LdapAnonConnFactory implements ILdapConnFactory { protected void init(int minConns, int maxConns, LdapConnInfo connInfo) throws ELdapException { if (mInited) - return; // XXX should throw exception here ? + return; // XXX should throw exception here ? if (minConns <= 0 || maxConns <= 0 || minConns > maxConns) throw new ELdapException( @@ -181,10 +181,10 @@ public class LdapAnonConnFactory implements ILdapConnFactory { } } catch (LDAPException e) { // XXX errorCodeToString() used here so users won't see message. - // though why are messages from exceptions being displayed to + // though why are messages from exceptions being displayed to // users ? if (e.getLDAPResultCode() == LDAPException.UNAVAILABLE) { - // need to intercept this because message from LDAP is + // need to intercept this because message from LDAP is // "DSA is unavailable" which confuses with DSA PKI. log(ILogger.LL_FAILURE, "Cannot connect to Ldap server. Error: " + @@ -215,7 +215,7 @@ public class LdapAnonConnFactory implements ILdapConnFactory { * If not the max number of connections may be reached prematurely. * The best thing to put returnConn in a finally clause so it * always gets called. For example, - * + * * <pre> * LDAPConnection c = null; * try { @@ -242,7 +242,7 @@ public class LdapAnonConnFactory implements ILdapConnFactory { * Returns null if maximum number of connections reached. * <p> * The best thing to put returnConn in a finally clause so it always gets called. For example, - * + * * <pre> * LDAPConnection c = null; * try { @@ -292,7 +292,7 @@ public class LdapAnonConnFactory implements ILdapConnFactory { "to " + mConnInfo.getHost() + ":" + mConnInfo.getPort()); } CMS.debug("LdapAnonConnFactory.getConn(): num avail conns now " + mNumConns); - //Beginning of fix for Bugzilla #630176 + //Beginning of fix for Bugzilla #630176 boolean isConnected = false; if (conn != null) { isConnected = conn.isConnected(); @@ -321,7 +321,7 @@ public class LdapAnonConnFactory implements ILdapConnFactory { * If not the max number of connections may be reached prematurely. * <p> * The best thing to put returnConn in a finally clause so it always gets called. For example, - * + * * <pre> * LDAPConnection c = null; * try { @@ -342,7 +342,7 @@ public class LdapAnonConnFactory implements ILdapConnFactory { AnonConnection anon = (AnonConnection) conn; if (anon.getFacId() != mConns) { - // returning a connection not from this factory. + // returning a connection not from this factory. log(ILogger.LL_WARN, "returnConn: unknown connection."); } // check if conn has already been returned. diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java index 1dc9723a8..a0d9b2466 100644 --- a/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java +++ b/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java @@ -42,7 +42,7 @@ public class LdapAnonConnection extends LDAPConnection { throws LDAPException { super(connInfo.getSecure() ? new LdapJssSSLSocketFactory() : null); - // Set option to automatically follow referrals. + // Set option to automatically follow referrals. // rebind info is also anonymous. boolean followReferrals = connInfo.getFollowReferrals(); diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java index b1af367b9..c1822113d 100644 --- a/base/common/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java +++ b/base/common/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java @@ -108,7 +108,7 @@ public class LdapAuthInfo implements ILdapAuthInfo { /** * initialize this class from the config store, and verify the password. - * + * * @param host The host that the directory server is running on. * This will be used to verify the password by attempting to connect. * If it is <code>null</code>, the password will not be verified. @@ -258,7 +258,7 @@ public class LdapAuthInfo implements ILdapAuthInfo { /** * get authentication type. - * + * * @return one of: <br> * LdapAuthInfo.LDAP_AUTHTYPE_BASICAUTH or * LdapAuthInfo.LDAP_AUTHTYPE_SSLCLIENTAUTH @@ -269,7 +269,7 @@ public class LdapAuthInfo implements ILdapAuthInfo { /** * get params for authentication - * + * * @return array of parameters for this authentication. */ public String[] getParms() { diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java index b4839f7d5..1da965a3a 100644 --- a/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java +++ b/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java @@ -51,7 +51,7 @@ public class LdapBoundConnFactory implements ILdapBoundConnFactory { public static final String PROP_ERROR_IF_DOWN = "errorIfDown"; 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 boolean doCloning = true; private LdapBoundConnection mMasterConn = null; // master connection object. @@ -92,7 +92,7 @@ public class LdapBoundConnFactory implements ILdapBoundConnFactory { /** * Constructor for LdapBoundConnFactory - * + * * @param minConns minimum number of connections to have available * @param maxConns max number of connections to have available. This is * the maximum number of clones of this connection or separate connections one wants to allow. @@ -128,7 +128,7 @@ public class LdapBoundConnFactory implements ILdapBoundConnFactory { /** * 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. @@ -169,7 +169,7 @@ public class LdapBoundConnFactory implements ILdapBoundConnFactory { /** * makes the initial master connection used to clone others.. - * + * * @exception ELdapException if any error occurs. */ protected void makeConnection(boolean errorIfDown) throws ELdapException { @@ -201,7 +201,7 @@ public class LdapBoundConnFactory implements ILdapBoundConnFactory { /** * makes subsequent connections if cloning is not used . - * + * * @exception ELdapException if any error occurs. */ private LdapBoundConnection makeNewConnection(boolean errorIfDown) throws ELdapException { @@ -268,7 +268,7 @@ public class LdapBoundConnFactory implements ILdapBoundConnFactory { * returnConn() method. * The best thing to do is to put returnConn in a finally clause so it * always gets called. For example, - * + * * <pre> * LDAPConnection c = null; * try { @@ -295,7 +295,7 @@ public class LdapBoundConnFactory implements ILdapBoundConnFactory { * 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> * LDAPConnection c = null; * try { @@ -396,7 +396,7 @@ public class LdapBoundConnFactory implements ILdapBoundConnFactory { * 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> * LDAPConnection c = null; * try { diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java index 4ef7d804c..f05fc237e 100644 --- a/base/common/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java +++ b/base/common/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java @@ -56,8 +56,8 @@ public class LdapConnInfo implements ILdapConnInfo { String version = (String) config.get(PROP_PROTOCOL); if (version != null && version.equals("")) { - // provide a default when this field is blank from the - // configuration. + // provide a default when this field is blank from the + // configuration. mVersion = LDAP_VERSION_3; } else { mVersion = config.getInteger(PROP_PROTOCOL, LDAP_VERSION_3); @@ -82,7 +82,7 @@ public class LdapConnInfo implements ILdapConnInfo { mPort = port; mSecure = secure; if (mHost == null || mPort <= 0) { - // XXX log something here + // XXX log something here throw new IllegalArgumentException("LDAP host or port is null"); } } @@ -91,7 +91,7 @@ public class LdapConnInfo implements ILdapConnInfo { mHost = host; mPort = port; if (mHost == null || mPort <= 0) { - // XXX log something here + // XXX log something here throw new IllegalArgumentException("LDAP host or port is null"); } } diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java index 4df2fe357..bad9e3b23 100644 --- a/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java +++ b/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java @@ -33,7 +33,7 @@ import com.netscape.certsrv.logging.ILogger; /** * Uses HCL ssl socket. - * + * * @author Lily Hsiao lhsiao@netscape.com */ public class LdapJssSSLSocketFactory implements LDAPSSLSocketFactoryExt { |