Merge pull request #1437 from rsksmart/fix-uselles-null-check

Fixing useless null check
rsksmart · Jun 14, 2021 · c94ab4a · c94ab4a
2 parents 98d21c8 + eaeb34a
commit c94ab4a
Show file tree

Hide file tree

Showing 3 changed files with 196 additions and 39 deletions.
diff --git a/rskj-core/src/main/java/co/rsk/peg/Bridge.java b/rskj-core/src/main/java/co/rsk/peg/Bridge.java
@@ -1187,7 +1187,7 @@ public static BridgeMethods.BridgeMethodExecutor activeAndRetiringFederationOnly
             Federation retiringFederation = self.bridgeSupport.getRetiringFederation();
 
             if (!BridgeUtils.isFromFederateMember(self.rskTx, self.bridgeSupport.getActiveFederation())
-                    && ( retiringFederation == null || (retiringFederation != null && !BridgeUtils.isFromFederateMember(self.rskTx, retiringFederation)))) {
+                    && (retiringFederation == null || !BridgeUtils.isFromFederateMember(self.rskTx, retiringFederation))) {
                 String errorMessage = String.format("Sender is not part of the active or retiring federations, so he is not enabled to call the function '%s'",funcName);
                 logger.warn(errorMessage);
                 throw new VMException(errorMessage);