# HG changeset patch
# User shade
# Date 1521112079 -3600
# Node ID 7443b946694ab110772b256aa1f48345f5ab03cd
# Parent  92cca24c8807ec45167760166dcd33e7a5756084
8188240: Reflection Proxy should skip static methods
Reviewed-by: mchung, sundar, shade, plevart
Contributed-by: David Lloyd <david.lloyd@redhat.com>

diff -r 92cca24c8807 -r 7443b946694a src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java
--- a/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java	Thu Mar 15 11:02:22 2018 +0000
+++ b/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java	Thu Mar 15 12:07:59 2018 +0100
@@ -449,7 +449,9 @@
          */
         for (Class<?> intf : interfaces) {
             for (Method m : intf.getMethods()) {
-                addProxyMethod(m, intf);
+                if (!Modifier.isStatic(m.getModifiers())) {
+                    addProxyMethod(m, intf);
+                }
             }
         }
 
diff -r 92cca24c8807 -r 7443b946694a test/jdk/java/lang/reflect/Proxy/ProxyClashTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/lang/reflect/Proxy/ProxyClashTest.java	Thu Mar 15 12:07:59 2018 +0100
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 8188240
+ * @summary This is a test to ensure that proxies do not try to intercept interface static methods.
+ *
+ * @build ProxyClashTest
+ * @run main ProxyClashTest
+ */
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.Observer;
+
+public class ProxyClashTest {
+
+    public interface ClashWithRunnable {
+        static int run() { return 123; }
+
+        static void foo() {}
+    }
+
+    public static void main(String[] args) {
+        System.err.println(
+            "\nDynamic proxy API static method clash test\n");
+
+        Class<?>[] interfaces =
+            new Class<?>[] { ClashWithRunnable.class, Runnable.class, Observer.class };
+
+        ClassLoader loader = ProxyClashTest.class.getClassLoader();
+
+        /*
+         * Generate a proxy class.
+         */
+        Class<?> proxyClass = Proxy.getProxyClass(loader, interfaces);
+        System.err.println("+ generated proxy class: " + proxyClass);
+
+        for (Method method : proxyClass.getDeclaredMethods()) {
+            if (method.getName().equals("run") && method.getReturnType() == int.class) {
+                throw new RuntimeException("proxy intercept a static method");
+            }
+            if (method.getName().equals("foo")) {
+                throw new RuntimeException("proxy intercept a static method");
+            }
+        }
+
+        System.err.println("\nTEST PASSED");
+    }
+}