Merge

d0ac2900 · kizune · f6fa0224 · a3fa71df · d0ac2900 · d0ac2900
隐藏空白更改
内联并排

Showing with 6 addition and 0 deletion

.hgtags .hgtags +4 -0

src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java .../se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java +2 -0

未找到文件。
--- a/.hgtags
+++ b/.hgtags
@@ -236,3 +236,7 @@ a4bb3b4500164748a9c33b2283cfda76d89f25ab jdk8-b108
 43cec76d1d62587a07af07e2d9bec93aba2a506b jdk8-b112
 a259ff3e42d91da68f4d4f09d7eb9dc22bc024fc jdk8-b113
 0bbccf77c23e566170b88b52c2cf28e5d31ce927 jdk8-b114
+8d07115924b7d703a5048adb24e8aba751442f13 jdk8-b115
+5fdc4465208933ba704825b2b05e1afd062235fb jdk8-b116
+e53d1ee4d2ae898f1cf58688d45a5afe7c482173 jdk8-b117
+d6820a414f182a011a53a29a52370c696cd58dab jdk8-b118
--- a/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java
+++ b/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java
@@ -89,4 +89,6 @@ public class CompositeInvocationHandlerImpl implements
            sm.checkPermission(perm);
 }
    }
+
+    private static final long serialVersionUID = 4571178305984833743L;
 }