summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sergio Giro <sgiro@google.com> 2016-07-27 11:30:55 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2016-07-27 11:30:55 +0000
commit877d6e75e62a80c88d9acffe65153fa7c65622ac (patch)
tree7c4ee6eba0d665d5d423a7e8c6607ca5e6ee40e4
parente40ab1859079e317640399e0891ded0b54bef69f (diff)
parent9e51eed091585d089fbdfc3b1f90b60a21ad54d4 (diff)
Merge "api: destroy() and isDestroyed() methods are now default in Destroyable"
-rw-r--r--api/current.txt6
-rw-r--r--api/system-current.txt6
2 files changed, 4 insertions, 8 deletions
diff --git a/api/current.txt b/api/current.txt
index 9f7e642af59d..28498fffb965 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -52603,9 +52603,7 @@ package java.security {
public static class KeyStore.PasswordProtection implements javax.security.auth.Destroyable java.security.KeyStore.ProtectionParameter {
ctor public KeyStore.PasswordProtection(char[]);
- method public synchronized void destroy() throws javax.security.auth.DestroyFailedException;
method public synchronized char[] getPassword();
- method public synchronized boolean isDestroyed();
}
public static final class KeyStore.PrivateKeyEntry implements java.security.KeyStore.Entry {
@@ -62351,8 +62349,8 @@ package javax.security.auth {
}
public abstract interface Destroyable {
- method public abstract void destroy() throws javax.security.auth.DestroyFailedException;
- method public abstract boolean isDestroyed();
+ method public default void destroy() throws javax.security.auth.DestroyFailedException;
+ method public default boolean isDestroyed();
}
public final class PrivateCredentialPermission extends java.security.Permission {
diff --git a/api/system-current.txt b/api/system-current.txt
index a097edba3861..6092433e7b34 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -55221,9 +55221,7 @@ package java.security {
public static class KeyStore.PasswordProtection implements javax.security.auth.Destroyable java.security.KeyStore.ProtectionParameter {
ctor public KeyStore.PasswordProtection(char[]);
- method public synchronized void destroy() throws javax.security.auth.DestroyFailedException;
method public synchronized char[] getPassword();
- method public synchronized boolean isDestroyed();
}
public static final class KeyStore.PrivateKeyEntry implements java.security.KeyStore.Entry {
@@ -64969,8 +64967,8 @@ package javax.security.auth {
}
public abstract interface Destroyable {
- method public abstract void destroy() throws javax.security.auth.DestroyFailedException;
- method public abstract boolean isDestroyed();
+ method public default void destroy() throws javax.security.auth.DestroyFailedException;
+ method public default boolean isDestroyed();
}
public final class PrivateCredentialPermission extends java.security.Permission {