Merge jdk8-b117

Thu, 14 Nov 2013 23:33:06 -0800

author
lana
date
Thu, 14 Nov 2013 23:33:06 -0800
changeset 541
e53d1ee4d2ae
parent 538
7299367c8aa4
parent 540
4796555c4dc8
child 542
d6820a414f18

Merge

     1.1 --- a/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java	Thu Nov 14 09:04:54 2013 -0800
     1.2 +++ b/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java	Thu Nov 14 23:33:06 2013 -0800
     1.3 @@ -89,4 +89,6 @@
     1.4              sm.checkPermission(perm);
     1.5  }
     1.6      }
     1.7 +
     1.8 +    private static final long serialVersionUID = 4571178305984833743L;
     1.9  }

mercurial