Merge
authorkatleman
Wed, 05 Dec 2012 12:53:55 -0800
changeset 14597 558a3373ba7e
parent 14595 69a527af467a (diff)
parent 14596 a1f29d55b5ee (current diff)
child 14598 87dc7ed3eda3
Merge
--- a/jdk/.hgtags	Wed Dec 05 10:12:57 2012 +0100
+++ b/jdk/.hgtags	Wed Dec 05 12:53:55 2012 -0800
@@ -187,3 +187,4 @@
 f117a3e06f78a258074674ad17601f99bcb1ce0d jdk8-b63
 26dbd73fb7662a29b3e47179fdc88a0bfa4e231e jdk8-b64
 130d3a54d28becaac0846137256c2684adb34c33 jdk8-b65
+4d337fae2250135729ee9ed2bf8baf3c60da5d6d jdk8-b66
--- a/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java	Wed Dec 05 10:12:57 2012 +0100
+++ b/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java	Wed Dec 05 12:53:55 2012 -0800
@@ -25,7 +25,7 @@
 
 package java.lang.invoke;
 
-import static com.sun.xml.internal.ws.org.objectweb.asm.Opcodes.*;
+import static jdk.internal.org.objectweb.asm.Opcodes.*;
 import static java.lang.invoke.LambdaForm.basicTypes;
 import static java.lang.invoke.MethodHandleNatives.Constants.REF_invokeStatic;
 import static java.lang.invoke.MethodHandleStatics.*;
@@ -40,9 +40,9 @@
 import sun.invoke.util.ValueConversions;
 import sun.invoke.util.Wrapper;
 
-import com.sun.xml.internal.ws.org.objectweb.asm.ClassWriter;
-import com.sun.xml.internal.ws.org.objectweb.asm.MethodVisitor;
-import com.sun.xml.internal.ws.org.objectweb.asm.Type;
+import jdk.internal.org.objectweb.asm.ClassWriter;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Type;
 
 /**
  * The flavor of method handle which emulates an invoke instruction
--- a/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java	Wed Dec 05 10:12:57 2012 +0100
+++ b/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java	Wed Dec 05 12:53:55 2012 -0800
@@ -34,7 +34,7 @@
 import java.io.*;
 import java.util.*;
 
-import com.sun.xml.internal.ws.org.objectweb.asm.*;
+import jdk.internal.org.objectweb.asm.*;
 
 import java.lang.reflect.*;
 import static java.lang.invoke.MethodHandleStatics.*;