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/cms/servlet | |
| parent | c863462bcba15e98d2decb583dcdebea81a702d1 (diff) | |
| download | pki-8b2c4edd96c11a65012ff9692f8733fdcdecea8a.tar.gz pki-8b2c4edd96c11a65012ff9692f8733fdcdecea8a.tar.xz pki-8b2c4edd96c11a65012ff9692f8733fdcdecea8a.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/cms/servlet')
5 files changed, 12 insertions, 14 deletions
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java b/pki/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java index a1ac32a6..8ca35484 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java @@ -372,8 +372,8 @@ public class ChallengeRevocationServlet1 extends CMSServlet { Vector<String> serialNumbers = new Vector<String>(); if (revokeAll != null && revokeAll.length() > 0) { - for (int i = revokeAll.indexOf('='); i < revokeAll.length() && i > -1; i = - revokeAll.indexOf('=', i)) { + for (int i = revokeAll.indexOf('='); i < revokeAll.length() && i > -1; + i = revokeAll.indexOf('=', i)) { if (i > -1) { i++; while (i < revokeAll.length() && revokeAll.charAt(i) == ' ') { diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java b/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java index dd739e37..5b93e12e 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java @@ -534,8 +534,8 @@ public class DoRevoke extends CMSServlet { Vector<String> serialNumbers = new Vector<String>(); if (revokeAll != null && revokeAll.length() > 0) { - for (int i = revokeAll.indexOf('='); i < revokeAll.length() && i > -1; i = - revokeAll.indexOf('=', i)) { + for (int i = revokeAll.indexOf('='); i < revokeAll.length() && i > -1; + i = revokeAll.indexOf('=', i)) { if (i > -1) { i++; while (i < revokeAll.length() && revokeAll.charAt(i) == ' ') { diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java b/pki/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java index 1acbac7f..67481e7d 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java @@ -205,8 +205,8 @@ public class GetCertFromRequest extends CMSServlet { } } - if (!((r.getRequestType().equals(IRequest.ENROLLMENT_REQUEST)) || (r.getRequestType() - .equals(IRequest.RENEWAL_REQUEST)))) { + if (!((r.getRequestType().equals(IRequest.ENROLLMENT_REQUEST)) || + (r.getRequestType().equals(IRequest.RENEWAL_REQUEST)))) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSGW_REQUEST_NOT_ENROLLMENT_1", requestId)); throw new ECMSGWException( diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java index 39071a53..4a7d70cc 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java @@ -1200,8 +1200,8 @@ public class ProfileSubmitServlet extends ProfileServlet { // no profile set found CMS.debug("ProfileSubmitServlet: no profile policy set found"); if (xmlOutput) { - outputError(response, FAILED, CMS.getUserMessage("CMS_PROFILE_NO_POLICY_SET_FOUND"), reqs[k] - .getRequestId().toString()); + outputError(response, FAILED, CMS.getUserMessage("CMS_PROFILE_NO_POLICY_SET_FOUND"), + reqs[k].getRequestId().toString()); } else { args.set(ARG_ERROR_CODE, "1"); args.set(ARG_ERROR_REASON, @@ -1250,8 +1250,8 @@ public class ProfileSubmitServlet extends ProfileServlet { // throw new IOException("Profile " + profileId + // " cannot populate"); if (xmlOutput) { - outputError(response, FAILED, CMS.getUserMessage(locale, "CMS_INTERNAL_ERROR"), reqs[k] - .getRequestId().toString()); + outputError(response, FAILED, CMS.getUserMessage(locale, "CMS_INTERNAL_ERROR"), + reqs[k].getRequestId().toString()); } else { args.set(ARG_ERROR_CODE, "1"); args.set(ARG_ERROR_REASON, CMS.getUserMessage(locale, diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java b/pki/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java index 91f901f2..46bc0885 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java +++ b/pki/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java @@ -444,10 +444,8 @@ public class CertReqParser extends ReqParser { (CertificateValidity) certInfo[0].get(X509CertInfo.VALIDITY); if (validity != null) { - long validityLength = - (((Date) validity.get(CertificateValidity.NOT_AFTER)).getTime() - ((Date) validity - .get(CertificateValidity.NOT_BEFORE)).getTime()) / 1000; - + long validityLength = (((Date) validity.get(CertificateValidity.NOT_AFTER)).getTime() - + ((Date) validity.get(CertificateValidity.NOT_BEFORE)).getTime()) / 1000; arg.addLongValue("validityLength", validityLength); } } catch (IOException e) { |