# HG changeset patch
# User lana
# Date 1384500786 28800
# Node ID e53d1ee4d2ae898f1cf58688d45a5afe7c482173
# Parent  7299367c8aa4ea057ee61fa6b68a1c410c546e81# Parent  4796555c4dc83943d7b1f4b74b585f5562759ba9
Merge

diff -r 7299367c8aa4 -r e53d1ee4d2ae src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java
--- a/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java	Thu Nov 14 09:04:54 2013 -0800
+++ b/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java	Thu Nov 14 23:33:06 2013 -0800
@@ -89,4 +89,6 @@
             sm.checkPermission(perm);
 }
     }
+
+    private static final long serialVersionUID = 4571178305984833743L;
 }