diff options
| author | Ade Lee <alee@redhat.com> | 2011-12-08 21:15:11 -0500 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2011-12-08 21:15:11 -0500 |
| commit | adad2fcee8a29fdb82376fbce07dedb11fccc182 (patch) | |
| tree | 52dd96f664a6fa51be25b28b6f10adc5f2c9f660 /pki/base/common/src/com/netscape/cms/servlet | |
| parent | 0b5c0e0542354edc8cab4da6a1afa1ff00800c0c (diff) | |
| download | pki-adad2fcee8a29fdb82376fbce07dedb11fccc182.tar.gz pki-adad2fcee8a29fdb82376fbce07dedb11fccc182.tar.xz pki-adad2fcee8a29fdb82376fbce07dedb11fccc182.zip | |
Revert "Indent in conditionals"
This reverts commit 0b5c0e0542354edc8cab4da6a1afa1ff00800c0c.
Diffstat (limited to 'pki/base/common/src/com/netscape/cms/servlet')
| -rw-r--r-- | pki/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java | 6 | ||||
| -rw-r--r-- | pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java b/pki/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java index f32b4484b..3b87ed5a5 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java @@ -228,7 +228,7 @@ public class GetCRL extends CMSServlet { || (op.equals("displayCRL") && crlDisplayType != null && (crlDisplayType .equals("entireCRL") || crlDisplayType.equals("crlHeader") || crlDisplayType - .equals("base64Encoded")))) { + .equals("base64Encoded")))) { crlbytes = crlRecord.getCRL(); } @@ -254,7 +254,7 @@ public class GetCRL extends CMSServlet { .equals("entireCRL") || crlDisplayType.equals("crlHeader") || crlDisplayType.equals("base64Encoded") || crlDisplayType - .equals("deltaCRL")))) { + .equals("deltaCRL")))) { try { if (op.equals("displayCRL") && crlDisplayType != null && crlDisplayType.equals("crlHeader")) { @@ -273,7 +273,7 @@ public class GetCRL extends CMSServlet { } if ((op.equals("importDeltaCRL") || (op.equals("displayCRL") && crlDisplayType != null && crlDisplayType - .equals("deltaCRL"))) + .equals("deltaCRL"))) && ((!(crlIP != null && crlIP.isThisCurrentDeltaCRL(crl))) && (crlRecord .getCRLNumber() == null || crlRecord.getDeltaCRLNumber() == null diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java b/pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java index 49ab9cc6e..fe2485a60 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java @@ -257,7 +257,7 @@ public class CRSEnrollment extends HttpServlet { if (!(mTokenName.equalsIgnoreCase(Constants.PR_INTERNAL_TOKEN) || mTokenName .equalsIgnoreCase("Internal Key Storage Token") || mTokenName - .length() == 0)) { + .length() == 0)) { int i = mNickname.indexOf(':'); if (!((i > -1) && (mTokenName.length() == i) && (mNickname .startsWith(mTokenName)))) { |