Not loading SAM adapters from compiled Kotlin classes.

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java

@@ -280,7 +280,9 @@ public final class JavaFunctionResolver {
             if (function != null) {
                 functionsFromCurrent.add(function);
 
-                ContainerUtil.addIfNotNull(functionsFromCurrent, resolveSamAdapter(function));
+                if (!DescriptorResolverUtils.isKotlinClass(psiClass)) {
+                    ContainerUtil.addIfNotNull(functionsFromCurrent, resolveSamAdapter(function));
+                }
             }
         }
 

compiler/testData/loadKotlin/fun/NoSamAdapter.txt

@@ -0,0 +1,7 @@
+package test
+
+internal fun foo(/*0*/ r: java.lang.Runnable): jet.Unit
+
+public trait TaskObject {
+    internal abstract fun foo(/*0*/ r: java.lang.Runnable): jet.Unit
+}

compiler/testData/loadKotlin/fun/NoSamConstructor.txt

@@ -0,0 +1,5 @@
+package test
+
+public trait Runnable {
+    internal abstract fun run(): jet.Unit
+}

compiler/testData/loadKotlin/fun/noSamAdapter.kt

@@ -0,0 +1,8 @@
+package test
+
+public trait TaskObject {
+    fun foo(r: Runnable)
+}
+
+fun foo(r: Runnable) {
+}

compiler/testData/loadKotlin/fun/noSamConstructor.kt

@@ -0,0 +1,5 @@
+package test
+
+public trait Runnable {
+    fun run()
+}

compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java

@@ -414,6 +414,16 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/fun"), Pattern.compile("^(.+)\\.kt$"), true);
         }
         
+        @TestMetadata("NoSamAdapter.kt")
+        public void testNoSamAdapter() throws Exception {
+            doTestWithAccessors("compiler/testData/loadKotlin/fun/NoSamAdapter.kt");
+        }
+        
+        @TestMetadata("NoSamConstructor.kt")
+        public void testNoSamConstructor() throws Exception {
+            doTestWithAccessors("compiler/testData/loadKotlin/fun/NoSamConstructor.kt");
+        }
+        
         @TestMetadata("PropagateDeepSubclass.kt")
         public void testPropagateDeepSubclass() throws Exception {
             doTestWithAccessors("compiler/testData/loadKotlin/fun/PropagateDeepSubclass.kt");

compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java

@@ -416,6 +416,16 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/fun"), Pattern.compile("^(.+)\\.kt$"), true);
             }
             
+            @TestMetadata("NoSamAdapter.kt")
+            public void testNoSamAdapter() throws Exception {
+                doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/fun/NoSamAdapter.kt");
+            }
+            
+            @TestMetadata("NoSamConstructor.kt")
+            public void testNoSamConstructor() throws Exception {
+                doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/fun/NoSamConstructor.kt");
+            }
+            
             @TestMetadata("PropagateDeepSubclass.kt")
             public void testPropagateDeepSubclass() throws Exception {
                 doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/fun/PropagateDeepSubclass.kt");