Merge
authorduke
Wed, 05 Jul 2017 20:21:51 +0200
changeset 29131 4f7df22218d0
parent 29130 92bf22ed0621 (diff)
parent 29127 ace848e154b9 (current diff)
child 29136 83576cafb3bb
Merge
hotspot/src/share/vm/oops/oop.inline2.hpp
jdk/src/java.base/share/classes/sun/security/acl/AclEntryImpl.java
jdk/src/java.base/share/classes/sun/security/acl/AclImpl.java
jdk/src/java.base/share/classes/sun/security/acl/AllPermissionsImpl.java
jdk/src/java.base/share/classes/sun/security/acl/GroupImpl.java
jdk/src/java.base/share/classes/sun/security/acl/OwnerImpl.java
jdk/src/java.base/share/classes/sun/security/acl/PermissionImpl.java
jdk/src/java.base/share/classes/sun/security/acl/PrincipalImpl.java
jdk/src/java.base/share/classes/sun/security/acl/WorldGroupImpl.java
jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_TW.java
jdk/test/com/sun/management/OperatingSystemMXBean/GetTotalSwapSpaceSize.java
jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh
jdk/test/sun/security/acl/PermissionImpl/PermissionEqualsHashCode.java
--- a/corba/.hgtags	Wed Jul 05 20:21:44 2017 +0200
+++ b/corba/.hgtags	Wed Jul 05 20:21:51 2017 +0200
@@ -294,3 +294,4 @@
 9285d14eb7b6b0815679bae98dd936dbc136218d jdk9-b49
 224f593393e5b01b3c8f1e591b7f4b1790a3737a jdk9-b50
 2309c02386d1fa4ced5051873ffb9e04874f7a44 jdk9-b51
+b8538bbb6f224ab1dabba579137099c166ad4724 jdk9-b52
--- a/corba/src/java.corba/share/classes/javax/rmi/CORBA/GetORBPropertiesFileAction.java	Wed Jul 05 20:21:44 2017 +0200
+++ b/corba/src/java.corba/share/classes/javax/rmi/CORBA/GetORBPropertiesFileAction.java	Wed Jul 05 20:21:51 2017 +0200
@@ -43,7 +43,6 @@
 
 import java.security.AccessController;
 import java.security.PrivilegedAction;
-import sun.security.action.GetPropertyAction;
 import java.util.Properties;
 
 class GetORBPropertiesFileAction implements PrivilegedAction {