diff options
| author | Ade Lee <alee@redhat.com> | 2012-01-09 23:04:22 -0500 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2012-01-11 14:25:11 -0500 |
| commit | 8b2c4edd96c11a65012ff9692f8733fdcdecea8a (patch) | |
| tree | e6c86135951c8728b322349bb9b1624dc4776ea3 /pki/base/common/src/com/netscape/certsrv | |
| parent | c863462bcba15e98d2decb583dcdebea81a702d1 (diff) | |
| download | pki-ayoung-ticket-2.tar.gz pki-ayoung-ticket-2.tar.xz pki-ayoung-ticket-2.zip | |
Formatting - fix bad wrapsayoung-ticket-2
Fixed conflicts in:
pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java
pki/base/common/src/com/netscape/cms/logging/LogFile.java
pki/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java
pki/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java
pki/base/common/src/com/netscape/cms/profile/common/EnrollProfile.java
pki/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java
pki/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java
pki/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java
pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java
Diffstat (limited to 'pki/base/common/src/com/netscape/certsrv')
| -rw-r--r-- | pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java | 4 | ||||
| -rw-r--r-- | pki/base/common/src/com/netscape/certsrv/util/HttpInput.java | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java b/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java index 20b33d1d..a50996f2 100644 --- a/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java +++ b/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java @@ -232,8 +232,8 @@ public class ARequestNotifier implements IRequestNotifier { if (!(requestType.equals(IRequest.ENROLLMENT_REQUEST) || requestType.equals(IRequest.RENEWAL_REQUEST) || requestType.equals(IRequest.REVOCATION_REQUEST) || - requestType.equals(IRequest.CMCREVOKE_REQUEST) || requestType - .equals(IRequest.UNREVOCATION_REQUEST))) { + requestType.equals(IRequest.CMCREVOKE_REQUEST) || + requestType.equals(IRequest.UNREVOCATION_REQUEST))) { continue; } if (i == 0 && id.equals(r.getRequestId().toString())) { diff --git a/pki/base/common/src/com/netscape/certsrv/util/HttpInput.java b/pki/base/common/src/com/netscape/certsrv/util/HttpInput.java index ea46c86a..fba601b6 100644 --- a/pki/base/common/src/com/netscape/certsrv/util/HttpInput.java +++ b/pki/base/common/src/com/netscape/certsrv/util/HttpInput.java @@ -174,9 +174,8 @@ public class HttpInput { return i; else { throw new IOException( - "Invalid key length '" - + i - + "'. Please consult your security officer for a proper length, or take the default value. Here are examples of some commonly used key lengths: 256, 384, 521."); + "Invalid key length '" + i + + "'. Please consult your security officer for a proper length, or take the default value. Here are examples of some commonly used key lengths: 256, 384, 521."); } /* |