You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2024/02/04 14:57:53 UTC
(commons-bcel) 01/02: Remove variable assignment just before returning it
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-bcel.git
commit e1e5f5ed551dc4c509009b4847ed1f5dc43ec9a0
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Feb 4 09:57:36 2024 -0500
Remove variable assignment just before returning it
---
src/main/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java | 3 +--
.../org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java | 6 ++----
src/test/java/org/apache/bcel/util/BCELifierTestCase.java | 3 +--
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java b/src/main/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java
index 25def60f..b9a67e5c 100644
--- a/src/main/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java
+++ b/src/main/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java
@@ -1043,8 +1043,7 @@ public final class Pass3aVerifier extends PassVerifier {
try {
delayedPass2Checks();
} catch (final ClassConstraintException | ClassFormatException cce) {
- vr = new VerificationResult(VerificationResult.VERIFIED_REJECTED, cce.getMessage());
- return vr;
+ return new VerificationResult(VerificationResult.VERIFIED_REJECTED, cce.getMessage());
}
try {
pass3StaticInstructionChecks();
diff --git a/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java b/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java
index 762f6fdb..056453c1 100644
--- a/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java
+++ b/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java
@@ -291,8 +291,7 @@ public class GeneratingAnnotatedClassesTestCase extends AbstractTestCase {
final ObjectType t = new ObjectType("SimpleAnnotation");
final List<ElementValuePairGen> elements = new ArrayList<>();
elements.add(nvGen);
- final AnnotationEntryGen a = new AnnotationEntryGen(t, elements, false, cp);
- return a;
+ return new AnnotationEntryGen(t, elements, false, cp);
}
public AnnotationEntryGen createSimpleVisibleAnnotation(final ConstantPoolGen cp) {
@@ -301,8 +300,7 @@ public class GeneratingAnnotatedClassesTestCase extends AbstractTestCase {
final ObjectType t = new ObjectType("SimpleAnnotation");
final List<ElementValuePairGen> elements = new ArrayList<>();
elements.add(nvGen);
- final AnnotationEntryGen a = new AnnotationEntryGen(t, elements, true, cp);
- return a;
+ return new AnnotationEntryGen(t, elements, true, cp);
}
private void dumpClass(final ClassGen cg, final String fname) {
diff --git a/src/test/java/org/apache/bcel/util/BCELifierTestCase.java b/src/test/java/org/apache/bcel/util/BCELifierTestCase.java
index 8ab68d6c..9e664454 100644
--- a/src/test/java/org/apache/bcel/util/BCELifierTestCase.java
+++ b/src/test/java/org/apache/bcel/util/BCELifierTestCase.java
@@ -48,8 +48,7 @@ public class BCELifierTestCase extends AbstractTestCase {
private String canonHashRef(String input) {
input = input.replaceAll("#\\d+", "#n"); // numbers may vary in length
input = input.replaceAll(" +", " "); // collapse spaces
- input = input.replaceAll("//.+", ""); // comments may vary
- return input;
+ return input.replaceAll("//.+", "");
}
private String exec(final File workDir, final String... args) throws Exception {