From 93326db9bf415fafd48a6cca77fe49cbd5680af4 Mon Sep 17 00:00:00 2001
From: Tomas Remes <tremes@redhat.com>
Date: Mon, 10 Jul 2017 11:45:05 +0200
Subject: [PATCH] WELD-2402 use default proxy package for signed classes

---
 .../jboss/weld/bean/proxy/ProxyFactory.java   | 20 +++++++++++++++++--
 .../org/jboss/weld/logging/BeanLogger.java    |  6 +++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/impl/src/main/java/org/jboss/weld/bean/proxy/ProxyFactory.java b/impl/src/main/java/org/jboss/weld/bean/proxy/ProxyFactory.java
index c2e412deafc..39328729a4b 100644
--- a/impl/src/main/java/org/jboss/weld/bean/proxy/ProxyFactory.java
+++ b/impl/src/main/java/org/jboss/weld/bean/proxy/ProxyFactory.java
@@ -121,6 +121,8 @@ public class ProxyFactory<T> implements PrivilegedAction<T> {
     protected static final String INIT_METHOD_NAME = "<init>";
     protected static final String METHOD_HANDLER_FIELD_NAME = "methodHandler";
     static final String JAVA = "java";
+    static final String NULL = "the class package is null";
+    static final String SIGNED = "the class is signed";
 
     private static final Set<ProxiedMethodFilter> METHOD_FILTERS;
 
@@ -232,15 +234,19 @@ static String getProxyName(String contextId, Class<?> proxiedBeanType, Set<? ext
             if (superInterface == null) {
                 throw new IllegalArgumentException("Proxied bean type cannot be java.lang.Object without an interface");
             } else {
-                if (superInterface.getPackage() == null) {
+                String reason = getDefaultPackageReason(superInterface);
+                if (reason != null) {
                     proxyPackage = DEFAULT_PROXY_PACKAGE;
+                    BeanLogger.LOG.generatingProxyToDefaultPackage(superInterface, DEFAULT_PROXY_PACKAGE, reason);
                 } else {
                     proxyPackage = superInterface.getPackage().getName();
                 }
             }
         } else {
-            if (proxiedBeanType.getPackage() == null) {
+            String reason = getDefaultPackageReason(proxiedBeanType);
+            if (reason != null) {
                 proxyPackage = DEFAULT_PROXY_PACKAGE;
+                BeanLogger.LOG.generatingProxyToDefaultPackage(proxiedBeanType, DEFAULT_PROXY_PACKAGE, reason);
             } else {
                 proxyPackage = proxiedBeanType.getPackage().getName();
             }
@@ -940,4 +946,14 @@ protected void getMethodHandlerField(ClassFile file, CodeAttribute b) {
     private Class<?> getProxySuperclass() {
         return getBeanType().isInterface() ? Object.class : getBeanType();
     }
+
+    private static String getDefaultPackageReason(Class<?> clazz) {
+        if (clazz.getPackage() == null) {
+            return NULL;
+        }
+        if (clazz.getSigners() != null) {
+            return SIGNED;
+        }
+        return null;
+    }
 }
diff --git a/impl/src/main/java/org/jboss/weld/logging/BeanLogger.java b/impl/src/main/java/org/jboss/weld/logging/BeanLogger.java
index ac21965884c..e3758d4a3b3 100644
--- a/impl/src/main/java/org/jboss/weld/logging/BeanLogger.java
+++ b/impl/src/main/java/org/jboss/weld/logging/BeanLogger.java
@@ -499,4 +499,8 @@ public interface BeanLogger extends WeldLogger {
     @Message(id = 1568, value = "Unable to create ClassFile for: {1}.", format = Format.MESSAGE_FORMAT)
     IllegalStateException unableToCreateClassFile(Object name, @Cause Throwable cause);
 
-}
\ No newline at end of file
+    @LogMessage(level = Level.INFO)
+    @Message(id = 1571, value = "Proxy for {0} created in {1} because {2}.", format = Format.MESSAGE_FORMAT)
+    void generatingProxyToDefaultPackage(Object param1, Object param2, Object param3);
+
+}