Merge branch 'master' into enh-moshi

server/src/main/java/password/pwm/svc/cr/NMASCrOperator.java

@@ -55,6 +55,7 @@ import com.novell.security.nmas.lcm.registry.GenLCMRegistry;
 import com.novell.security.nmas.lcm.registry.LCMRegistry;
 import com.novell.security.nmas.lcm.registry.LCMRegistryException;
 import com.novell.security.nmas.ui.GenLcmUI;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
@@ -915,6 +916,7 @@ public class NMASCrOperator implements CrOperator
             }
         }
 
+        @SuppressFBWarnings( "DCN_NULLPOINTER_EXCEPTION" )
         private void doLoginSequence( )
         {
             if ( loginState == NMASThreadState.ABORTED || loginState == NMASThreadState.COMPLETED )

server/src/main/java/password/pwm/util/localdb/LocalDBAdaptor.java

@@ -120,10 +120,6 @@ public class LocalDBAdaptor implements LocalDB
                 ParameterValidator.validateKeyValue( loopKey );
                 ParameterValidator.validateValueValue( loopValue );
             }
-            catch ( final NullPointerException e )
-            {
-                throw new NullPointerException( e.getMessage() + " for transaction record: '" + loopKey + "'" );
-            }
             catch ( final IllegalArgumentException e )
             {
                 throw new IllegalArgumentException( e.getMessage() + " for transaction record: '" + loopKey + "'" );
@@ -185,10 +181,6 @@ public class LocalDBAdaptor implements LocalDB
             {
                 ParameterValidator.validateValueValue( loopKey );
             }
-            catch ( final NullPointerException e )
-            {
-                throw new NullPointerException( e.getMessage() + " for transaction record: '" + loopKey + "'" );
-            }
             catch ( final IllegalArgumentException e )
             {
                 throw new IllegalArgumentException( e.getMessage() + " for transaction record: '" + loopKey + "'" );