No need to nest in else.
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 @@
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 @@
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;
}
