From 3bee3a1c7932f38b7e0cdc593a786cfbab395f28 Mon Sep 17 00:00:00 2001 From: Sanne Grinovero Date: Mon, 18 Oct 2021 10:30:14 +0100 Subject: [PATCH] HHH-14816 Minor refactoring of LockModeTypeHelper conversions --- .../jpa/internal/util/LockModeTypeHelper.java | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LockModeTypeHelper.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LockModeTypeHelper.java index 6da1cdadef..20f358fa03 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LockModeTypeHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LockModeTypeHelper.java @@ -39,21 +39,10 @@ else if ( LockModeType.class.isInstance( value ) ) { return getLockMode( (LockModeType) value ); } else if ( String.class.isInstance( value ) ) { - // first try LockMode name - LockMode lockMode = LockMode.fromExternalForm( (String) value ); - if ( lockMode == null ) { - try { - lockMode = getLockMode( LockModeType.valueOf( (String) value ) ); - } - catch (Exception ignore) { - } - } - if ( lockMode != null ) { - return lockMode; - } + return LockMode.fromExternalForm( (String) value ); } - throw new IllegalArgumentException( "Unknown lock mode source : " + value ); + throw new IllegalArgumentException( "Unknown lock mode source: '" + value + "'; can't convert from value of type " + value.getClass() ); } }