infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-07-30 04:43:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

8285285: Avoid redundant allocations in WindowsPreferences

Browse Source 
Reviewed-by: jpai
This commit is contained in:
Andrey Turbanov 2022-06-06 21:15:37 +00:00
parent 3eb49fecea
commit e94b05c720
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/java.prefs/windows/classes/java/util/prefs/WindowsPreferences.java
View File

@ -498,9 +498,9 @@ class WindowsPreferences extends AbstractPreferences {
* given security mask.
* @param securityMask Windows security mask.
* @return Windows registry key's handle.
* @see #openKey(byte[], int)
* @see #openKey(int, byte[], int)
* @see #closeKey(int)
* @see #openKey(byte[], int, int)
* @see #openKey(long, byte[], int, int)
* @see #closeKey(long)
*/
private long openKey(int securityMask) {
return openKey(securityMask, securityMask);
@ -512,9 +512,9 @@ class WindowsPreferences extends AbstractPreferences {
* @param mask1 Preferred Windows security mask.
* @param mask2 Alternate Windows security mask.
* @return Windows registry key's handle.
* @see #openKey(byte[], int)
* @see #openKey(int, byte[], int)
* @see #closeKey(int)
* @see #openKey(byte[], int, int)
* @see #openKey(long, byte[], int, int)
* @see #closeKey(long)
*/
private long openKey(int mask1, int mask2) {
return openKey(windowsAbsolutePath(), mask1, mask2);
@ -529,8 +529,8 @@ class WindowsPreferences extends AbstractPreferences {
* @param mask2 Alternate Windows security mask.
* @return Windows registry key's handle.
* @see #openKey(int)
* @see #openKey(int, byte[],int)
* @see #closeKey(int)
* @see #openKey(long, byte[], int, int)
* @see #closeKey(long)
*/
private long openKey(byte[] windowsAbsolutePath, int mask1, int mask2) {
/* Check if key's path is short enough be opened at once
@ -568,15 +568,15 @@ class WindowsPreferences extends AbstractPreferences {
/**
* Opens Windows registry key at a given relative path
* with respect to a given Windows registry key.
* @param windowsAbsolutePath Windows relative path of the
* @param windowsRelativePath Windows relative path of the
* key as a byte-encoded string.
* @param nativeHandle handle to the base Windows key.
* @param mask1 Preferred Windows security mask.
* @param mask2 Alternate Windows security mask.
* @return Windows registry key's handle.
* @see #openKey(int)
* @see #openKey(byte[],int)
* @see #closeKey(int)
* @see #openKey(byte[], int, int)
* @see #closeKey(long)
*/
private long openKey(long nativeHandle, byte[] windowsRelativePath,
int mask1, int mask2) {
@ -630,10 +630,10 @@ class WindowsPreferences extends AbstractPreferences {
/**
* Closes Windows registry key.
* Logs a warning if Windows registry is unavailable.
* @param key's Windows registry handle.
* @param nativeHandle Windows registry handle.
* @see #openKey(int)
* @see #openKey(byte[],int)
* @see #openKey(int, byte[],int)
* @see #openKey(byte[], int, int)
* @see #openKey(long, byte[], int, int)
*/
private void closeKey(long nativeHandle) {
int result = WindowsRegCloseKey(nativeHandle);
@ -807,7 +807,6 @@ class WindowsPreferences extends AbstractPreferences {
closeKey(nativeHandle);
return new String[0];
}
String[] subkeys = new String[subKeysNumber];
String[] children = new String[subKeysNumber];
// Get children
for (int i = 0; i < subKeysNumber; i++) {
@ -870,7 +869,7 @@ class WindowsPreferences extends AbstractPreferences {
/**
* Implements {@code Preferences} {@code sync()} method.
* Flushes Windows registry changes to disk. Equivalent to flush().
* @see flush()
* @see #flush()
*/
public void sync() throws BackingStoreException{
if (isRemoved())
@ -929,8 +928,7 @@ class WindowsPreferences extends AbstractPreferences {
private static String toJavaName(byte[] windowsNameArray) {
String windowsName = byteArrayToString(windowsNameArray);
// check if Alt64
if ((windowsName.length() > 1) &&
(windowsName.substring(0, 2).equals("/!"))) {
if (windowsName.startsWith("/!")) {
return toJavaAlt64Name(windowsName);
}
StringBuilder javaName = new StringBuilder();