[Blazebit#722] Fix NPE during view attribute accessor resolving when …

…lacking an explicit version mapping
beikov · Jan 22, 2019 · 7465aa7 · 7465aa7
1 parent 45f1ad9
commit 7465aa7
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/...impl/src/main/java/com/blazebit/persistence/view/impl/accessor/ViewAttributeAccessor.java b/...impl/src/main/java/com/blazebit/persistence/view/impl/accessor/ViewAttributeAccessor.java
@@ -35,17 +35,16 @@ public class ViewAttributeAccessor implements AttributeAccessor {
     private final Field field;
 
     ViewAttributeAccessor(EntityViewManagerImpl evm, MethodAttribute<?, ?> attribute, boolean readonly) {
-        Class<?> clazz = attribute.getDeclaringType().getJavaType();
-        Method getter = ReflectionUtils.getGetter(clazz, attribute.getName());
-        if (!Modifier.isPublic(getter.getModifiers()) || !Modifier.isPublic(getter.getDeclaringClass().getModifiers())) {
+        Method getter = attribute.getJavaMethod();
+        if (getter != null && (!Modifier.isPublic(getter.getModifiers()) || !Modifier.isPublic(getter.getDeclaringClass().getModifiers()))) {
             try {
                 getter.setAccessible(true);
             } catch (Exception e) {
                 throw new RuntimeException("Couldn't make method for entity view attribute accessible for reading!", e);
             }
         }
         this.getter = getter;
-        if (readonly) {
+        if (readonly && getter != null) {
             this.field = null;
         } else {
             Class<?> proxyClass = evm.getProxyFactory().getProxy(evm, (ManagedViewTypeImplementor<Object>) attribute.getDeclaringType(), null);
@@ -67,7 +66,11 @@ public Object getOrCreateValue(Object object) {
     @Override
     public Object getValue(Object object) {
         try {
-            return getter.invoke(object);
+            if (getter == null) {
+                return field.get(object);
+            } else {
+                return getter.invoke(object);
+            }
         } catch (Exception e) {
             throw new RuntimeException("Couldn't get value from entity view attribute!", e);
         }