[commons-weaver] branch master updated: No need to nest in else.

[ggregory]

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-weaver.git


The following commit(s) were added to refs/heads/master by this push:
     new ca6508a  No need to nest in else.
ca6508a is described below

commit ca6508ab1e09ba174ff260bda3a55b672272e099
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Mar 5 15:05:08 2021 -0500

    No need to nest in else.
---
 .../org/apache/commons/weaver/privilizer/BlueprintingVisitor.java    | 5 ++---
 .../test/java/org/apache/commons/weaver/test/weaver/TestCleaner.java | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git 
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/BlueprintingVisitor.java
 
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/BlueprintingVisitor.java
index 72d0ca9..af505ef 100644
--- 
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/BlueprintingVisitor.java
+++ 
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/BlueprintingVisitor.java
@@ -361,12 +361,11 @@ class BlueprintingVisitor extends 
Privilizer.PrivilizerClassVisitor {
             final Type ownerType = Type.getObjectType(owner);
             final Method method = new Method(name, desc);
 
-            if (isAccessible(ownerType) && isAccessible(ownerType, method)) {
-                super.visitNonImportedMethodInsn(opcode, owner, name, desc, 
itf);
-            } else {
+            if (!isAccessible(ownerType) || !isAccessible(ownerType, method)) {
                 throw new IllegalStateException(String.format("Blueprint 
method %s.%s calls inaccessible method %s.%s",
                     this.owner, methodKey.getRight(), owner, method));
             }
+            super.visitNonImportedMethodInsn(opcode, owner, name, desc, itf);
         }
 
         @Override
diff --git 
a/processor/src/test/java/org/apache/commons/weaver/test/weaver/TestCleaner.java
 
b/processor/src/test/java/org/apache/commons/weaver/test/weaver/TestCleaner.java
index c07ce9f..eac0a9e 100644
--- 
a/processor/src/test/java/org/apache/commons/weaver/test/weaver/TestCleaner.java
+++ 
b/processor/src/test/java/org/apache/commons/weaver/test/weaver/TestCleaner.java
@@ -39,11 +39,10 @@ public class TestCleaner implements Cleaner {
                 WeaveInterest.of(TestAnnotation.class, ElementType.METHOD));
 
         for (final WeavableClass<?> weavableClass : 
scanner.scan(scanRequest).getClasses()) {
-            if (environment.deleteClassfile(weavableClass.getTarget())) {
-                result = true;
-            } else {
+            if (!environment.deleteClassfile(weavableClass.getTarget())) {
                 break;
             }
+            result = true;
         }
         return result;
     }