Dead code removal

This patch removes all of the locations that Eclipse identified as Dead code.
Only the Eclipse automated cleanups were performed,  which means that some of the locations which were in *if* blocks still have the corresponding brackets around them.
These ensure that the original variable semantics weren't changed,  but are safe to remove in the future.

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@2296 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

2 files changed, 1 insertions, 12 deletions

diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java b/pki/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java
index 1c437896d..3208a23d7 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java
+++ b/pki/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java
@@ -434,18 +434,9 @@ public class DBSubsystem implements IDBSubsystem {
             nextRange = (String) attr.getStringValues().nextElement();
 
             BigInteger nextRangeNo = new BigInteger(nextRange);
-            if (nextRangeNo == null) {
-               throw new EBaseException("nextRangeNo is null!");
-            }
-
             BigInteger incrementNo = new BigInteger((String) h.get(PROP_INCREMENT));
-            if (incrementNo == null) {
-               throw new EBaseException("incrementNo is null!");
-            }
-
             // To make sure attrNextRange always increments, first delete the current value and then 
             // increment.  Two operations in the same transaction 
-
             LDAPAttribute attrNextRange = new LDAPAttribute(PROP_NEXT_RANGE,  nextRangeNo.add(incrementNo).toString());
             LDAPModification [] mods = {
                 new LDAPModification( LDAPModification.DELETE, attr), 
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecordList.java b/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecordList.java
index a3a3a98c0..d672b5157 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecordList.java
+++ b/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecordList.java
@@ -84,10 +84,8 @@ public class KeyRecordList implements IKeyRecordList {
                 entries.addElement(element);
             }
         }
-        if (entries != null) {
+        {
             return entries.elements();
-        } else {
-            return null;
         }
     }
 }