Cleaned up DefStore.processRequest() (part 3).

Some nested if-statements in DefStore.processRequest() has been
merged for clarity.

https://pagure.io/dogtagpki/issue/2652

Change-Id: Iedbda7d884cd4735a9c591a57d05b1086b4cb36d

1 files changed, 11 insertions, 9 deletions

diff --git a/base/server/cms/src/com/netscape/cms/ocsp/DefStore.java b/base/server/cms/src/com/netscape/cms/ocsp/DefStore.java
index 0b29b0830..676257bb7 100644
--- a/base/server/cms/src/com/netscape/cms/ocsp/DefStore.java
+++ b/base/server/cms/src/com/netscape/cms/ocsp/DefStore.java
@@ -499,16 +499,18 @@ public class DefStore implements IDefStore, IExtendedPluginInfo {
                 thisUpdate = new GeneralizedTime(
                             theRec.getThisUpdate());
             }
-            GeneralizedTime nextUpdate = null;
 
-            if (includeNextUpdate()) {
-                // this is an optional field
-                if (theRec == null) {
-                    nextUpdate = new GeneralizedTime(CMS.getCurrentDate());
-                } else {
-                    nextUpdate = new GeneralizedTime(
-                                theRec.getNextUpdate());
-                }
+            // this is an optional field
+            GeneralizedTime nextUpdate;
+
+            if (!includeNextUpdate()) {
+                nextUpdate = null;
+
+            } else if (theRec == null) {
+                nextUpdate = new GeneralizedTime(CMS.getCurrentDate());
+
+            } else {
+                nextUpdate = new GeneralizedTime(theRec.getNextUpdate());
             }
 
             if (theCRL == null) {