WELD-2447 Make proxy serialization container agnostic.

weld · Jan 9, 2018 · fa0d5a1 · fa0d5a1
1 parent 21f1ec0
commit fa0d5a1
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyFactory.java b/impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyFactory.java
@@ -69,10 +69,12 @@ public class ClientProxyFactory<T> extends ProxyFactory<T> {
      * field.
      */
     private static final String BEAN_ID_FIELD = "BEAN_ID_FIELD";
+    private static final String CONTEXT_ID_FIELD = "CONTEXT_ID_FIELD";
 
     private final BeanIdentifier beanId;
 
     private volatile Field beanIdField;
+    private volatile Field contextIdField;
 
     public ClientProxyFactory(String contextId, Class<?> proxiedBeanType, Set<? extends Type> typeClosure, Bean<?> bean) {
         super(contextId, proxiedBeanType, typeClosure, bean);
@@ -88,7 +90,13 @@ public T create(BeanInstance beanInstance) {
                 AccessController.doPrivileged(SetAccessibleAction.of(f));
                 beanIdField = f;
             }
+            if (contextIdField == null) {
+                final Field f = AccessController.doPrivileged(new GetDeclaredFieldAction(instance.getClass(), CONTEXT_ID_FIELD));
+                AccessController.doPrivileged(SetAccessibleAction.of(f));
+                contextIdField = f;
+            }
             beanIdField.set(instance, beanId);
+            contextIdField.set(instance, getContextId());
             return instance;
         } catch (IllegalAccessException e) {
             throw new RuntimeException(e);
@@ -133,6 +141,7 @@ private void generateBodyForWeldClientProxyMethod(ClassMethod method) throws Exc
     protected void addFields(final ClassFile proxyClassType, List<DeferredBytecode> initialValueBytecode) {
         super.addFields(proxyClassType, initialValueBytecode);
         proxyClassType.addField(AccessFlag.VOLATILE | AccessFlag.PRIVATE, BEAN_ID_FIELD, BeanIdentifier.class);
+        proxyClassType.addField(AccessFlag.VOLATILE | AccessFlag.PRIVATE, CONTEXT_ID_FIELD, String.class);
     }
 
     @Override
@@ -151,7 +160,8 @@ protected void addSerializationSupport(ClassFile proxyClassType) {
         b.dup();
         b.aload(0);
         b.getfield(proxyClassType.getName(), BEAN_ID_FIELD, BeanIdentifier.class);
-        b.ldc(getContextId());
+        b.aload(0);
+        b.getfield(proxyClassType.getName(), CONTEXT_ID_FIELD, String.class);
         b.invokespecial(SerializableClientProxy.class.getName(), INIT_METHOD_NAME, "(" + LBEAN_IDENTIFIER + LJAVA_LANG_STRING + ")" + BytecodeUtils.VOID_CLASS_DESCRIPTOR);
         b.returnInstruction();
     }