replaced XMemory.byteSizeObjectHeader in AbstractBinaryHandlerGenericImmutableCollections12

Author: hg-ms

persistence/binary/src/main/java/org/eclipse/serializer/persistence/binary/java/util/AbstractBinaryHandlerGenericImmutableCollections12.java

@@ -23,6 +23,7 @@
 import org.eclipse.serializer.persistence.types.PersistenceReferenceLoader;
 import org.eclipse.serializer.persistence.types.PersistenceStoreHandler;
 import org.eclipse.serializer.reference.Swizzling;
+import org.eclipse.serializer.reflect.XReflect;
 
 /**
  * Generic abstract class for specialized handler for
@@ -73,6 +74,7 @@ public abstract class AbstractBinaryHandlerGenericImmutableCollections12<T> exte
 	 * Constructor
 	 *
 	 * @param type the handled type.
+	 * @throws NoSuchFieldException
 	 */
 	protected AbstractBinaryHandlerGenericImmutableCollections12(final Class<T> type)
 	{
@@ -81,9 +83,11 @@ protected AbstractBinaryHandlerGenericImmutableCollections12(final Class<T> type
 				CustomField(Object.class, "e0"),
 				CustomField(Object.class, "e1")
 				));
+		
+		this.memoryOffset_e0 = (int) XMemory.objectFieldOffset(XReflect.getAnyField(type, "e0"));
+		this.memoryOffset_e1 = (int) XMemory.objectFieldOffset(XReflect.getAnyField(type, "e1"));
 
-		this.memoryOffset_e0 = XMemory.byteSizeObjectHeader(type);
-		this.memoryOffset_e1 = this.memoryOffset_e0 + XMemory.byteSizeReference();
+		
 	}