changeset 561:6b9b31f2298b

Merge
author kizune
date Tue, 03 Dec 2013 14:13:04 +0400
parents b083590cb088 5029f982dfae
children d05c64360b6c
files
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Nov 12 18:04:13 2013 +0000
+++ b/.hgtags	Tue Dec 03 14:13:04 2013 +0400
@@ -236,3 +236,7 @@
 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	Tue Nov 12 18:04:13 2013 +0000
+++ b/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java	Tue Dec 03 14:13:04 2013 +0400
@@ -89,4 +89,6 @@
             sm.checkPermission(perm);
 }
     }
+
+    private static final long serialVersionUID = 4571178305984833743L;
 }