#933

Impetus · Apr 6, 2017 · 674c7db · 674c7db
1 parent 74e885e
commit 674c7db
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/src/kundera-redis/src/main/java/com/impetus/client/redis/RedisClient.java b/src/kundera-redis/src/main/java/com/impetus/client/redis/RedisClient.java
@@ -22,6 +22,7 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -1428,6 +1429,11 @@ private void addToWrapper(EntityMetadata entityMetadata, AttributeWrapper wrappe
     private void addToWrapper(EntityMetadata entityMetadata, AttributeWrapper wrapper, Object embeddedObject,
             Attribute attrib, Attribute embeddedAttrib)
     {
+        if (embeddedObject == null)
+        {
+            return;
+        }
+
         byte[] value = PropertyAccessorHelper.get(embeddedObject, (Field) attrib.getJavaMember());
         byte[] name;
         if (value != null)
@@ -1542,8 +1548,17 @@ private Object unwrap(EntityMetadata entityMetadata, Map<byte[], byte[]> results
                                     .getEntityClazz());
 
                             EmbeddableType embeddableAttribute = embeddables.get(embeddedFieldName);
-
-                            Attribute attrib = embeddableAttribute.getAttribute(embeddedColumnName);
+
+                            AbstractAttribute attrib = null;
+                            Iterator itr = embeddableAttribute.getAttributes().iterator();
+                            while (itr.hasNext())
+                            {
+                                attrib = (AbstractAttribute) itr.next();
+                                if (attrib.getJPAColumnName().equals(embeddedColumnName))
+                                {
+                                    break;
+                                }
+                            }
 
                             Object embeddedObject = PropertyAccessorHelper.getObject(entity, (Field) entityType
                                     .getAttribute(embeddedFieldName).getJavaMember());