From 4a012010233b0a5fd613c9d7734ee01be64e3834 Mon Sep 17 00:00:00 2001
From: Abhishek Koneru <akoneru@redhat.com>
Date: Tue, 5 Jun 2012 12:16:51 -0400
Subject: Fixes for NULL_RETURN cases review comments

---
 base/ca/src/com/netscape/ca/CRLIssuingPoint.java | 40 +++++++++++++-----------
 1 file changed, 21 insertions(+), 19 deletions(-)

(limited to 'base/ca')

diff --git a/base/ca/src/com/netscape/ca/CRLIssuingPoint.java b/base/ca/src/com/netscape/ca/CRLIssuingPoint.java
index 56dcc2457..5dd823737 100644
--- a/base/ca/src/com/netscape/ca/CRLIssuingPoint.java
+++ b/base/ca/src/com/netscape/ca/CRLIssuingPoint.java
@@ -1694,23 +1694,24 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
      * <P>
      */
     public void run() {
-        while (mEnable && ((mEnableCRLCache && mCacheUpdateInterval > 0) ||
-                           (mInitialized == CRL_IP_NOT_INITIALIZED) ||
-                            mDoLastAutoUpdate || (mEnableCRLUpdates &&
+        try {
+            while (mEnable && ((mEnableCRLCache && mCacheUpdateInterval > 0) ||
+                    (mInitialized == CRL_IP_NOT_INITIALIZED) ||
+                    mDoLastAutoUpdate || (mEnableCRLUpdates &&
+                    ((mEnableDailyUpdates && mDailyUpdates != null &&
+                            mTimeListSize > 0) ||
+                            (mEnableUpdateFreq && mAutoUpdateInterval > 0) ||
+                    mDoManualUpdate)))) {
+
+                synchronized (this) {
+                    long delay = 0;
+                    long delay2 = 0;
+                    boolean doCacheUpdate = false;
+                    boolean scheduledUpdates = mEnableCRLUpdates &&
                             ((mEnableDailyUpdates && mDailyUpdates != null &&
-                                    mTimeListSize > 0) ||
-                                    (mEnableUpdateFreq && mAutoUpdateInterval > 0) ||
-                              mDoManualUpdate)))) {
-
-            synchronized (this) {
-                long delay = 0;
-                long delay2 = 0;
-                boolean doCacheUpdate = false;
-                boolean scheduledUpdates = mEnableCRLUpdates &&
-                        ((mEnableDailyUpdates && mDailyUpdates != null &&
-                        mTimeListSize > 0) ||
-                        (mEnableUpdateFreq && mAutoUpdateInterval > 0));
-                try {
+                            mTimeListSize > 0) ||
+                            (mEnableUpdateFreq && mAutoUpdateInterval > 0));
+
                     if (mInitialized == CRL_IP_NOT_INITIALIZED)
                         initCRL();
 
@@ -1766,11 +1767,12 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
                             mSignatureAlgorithmForManualUpdate = null;
                         }
                     }
-                } catch (EBaseException e1) {
-                    // TODO Auto-generated catch block
-                    e1.printStackTrace();
+
                 }
             }
+        } catch (EBaseException e1) {
+            // TODO Auto-generated catch block
+            e1.printStackTrace();
         }
         mUpdateThread = null;
     }
-- 
cgit