Skip to content

Commit 9399214

Browse files
committed
HHH-15514 Fix security manager class rewriting issue
1 parent bb5aa62 commit 9399214

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

hibernate-core/src/main/java/org/hibernate/bytecode/internal/bytebuddy/ByteBuddyState.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ private Unloaded<?> make(DynamicType.Builder<?> builder) {
199199
}
200200

201201
private Unloaded<?> make(TypePool typePool, DynamicType.Builder<?> builder) {
202-
classRewriter.installReflectionMethodVisitors( builder );
202+
builder = classRewriter.installReflectionMethodVisitors( builder );
203203

204204
Unloaded<?> unloadedClass;
205205
if ( typePool != null ) {
@@ -318,7 +318,7 @@ public FieldAccessor.PropertyConfigurable getInterceptorFieldAccessor() {
318318
}
319319

320320
private interface ClassRewriter {
321-
void installReflectionMethodVisitors(DynamicType.Builder<?> builder);
321+
DynamicType.Builder<?> installReflectionMethodVisitors(DynamicType.Builder<?> builder);
322322

323323
void registerAuthorizedClass(Unloaded<?> unloadedClass);
324324
}
@@ -334,9 +334,9 @@ private SecurityManagerClassRewriter() {
334334
}
335335

336336
@Override
337-
public void installReflectionMethodVisitors(DynamicType.Builder<?> builder) {
337+
public DynamicType.Builder<?> installReflectionMethodVisitors(DynamicType.Builder<?> builder) {
338338
builder = builder.visit( getDeclaredMethodMemberSubstitution );
339-
builder = builder.visit( getMethodMemberSubstitution );
339+
return builder.visit( getMethodMemberSubstitution );
340340
}
341341

342342
@Override
@@ -371,8 +371,9 @@ private static ForDeclaredMethods getMethodMemberSubstitution() {
371371
private static class StandardClassRewriter implements ClassRewriter {
372372

373373
@Override
374-
public void installReflectionMethodVisitors(DynamicType.Builder<?> builder) {
374+
public DynamicType.Builder<?> installReflectionMethodVisitors(DynamicType.Builder<?> builder) {
375375
// do nothing
376+
return builder;
376377
}
377378

378379
@Override

0 commit comments

Comments
 (0)