Merge
authorduke
Wed, 05 Jul 2017 17:45:15 +0200
changeset 9738 4e5ce061a282
parent 9737 6fcd25d0c401 (diff)
parent 9735 de8337feedb0 (current diff)
child 9740 6ecc2eb15c0c
Merge
--- a/corba/.hgtags	Wed Jul 05 17:45:12 2017 +0200
+++ b/corba/.hgtags	Wed Jul 05 17:45:15 2017 +0200
@@ -117,3 +117,4 @@
 cdf5d19ec142424489549025e9c42e51f32cf688 jdk7-b140
 a58635cdd921bafef353f4864184a0481353197b jdk7-b141
 a2f340a048c88d10cbedc0504f5cf03d39925a40 jdk7-b142
+51ed32f6f4de56f16e910ac54ba6c6f6606f4f17 jdk7-b143
--- a/corba/src/share/classes/com/sun/corba/se/impl/transport/CorbaTransportManagerImpl.java	Wed Jul 05 17:45:12 2017 +0200
+++ b/corba/src/share/classes/com/sun/corba/se/impl/transport/CorbaTransportManagerImpl.java	Wed Jul 05 17:45:15 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it