Skip to content

Commit e84b3d9

Browse files
kstangertomball
authored andcommitted
Moves the @weak reference from X500Principal.thisX500Name to X500Name.x500Principal. This is correct because X500Principal appears to always be the parent object.
Change on 2017/06/22 by kstanger <[email protected]> ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=159828606
1 parent e2ffd03 commit e84b3d9

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

jre_emul/android/platform/libcore/ojluni/src/main/java/javax/security/auth/x500/X500Principal.java

-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
package javax.security.auth.x500;
2727

28-
import com.google.j2objc.annotations.Weak;
2928
import java.io.*;
3029
import java.security.Principal;
3130
import java.util.Collections;
@@ -84,7 +83,6 @@ public final class X500Principal implements Principal, java.io.Serializable {
8483
*
8584
* NOTE: this field is reflectively accessed from within X500Name.
8685
*/
87-
@Weak
8886
private transient X500Name thisX500Name;
8987

9088
/**

jre_emul/android/platform/libcore/ojluni/src/main/java/sun/security/x509/X500Name.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626

2727
package sun.security.x509;
2828

29+
import com.google.j2objc.annotations.Weak;
30+
2931
import java.lang.reflect.*;
3032
import java.io.IOException;
3133
import java.io.StringReader;
@@ -135,7 +137,7 @@ public class X500Name implements GeneralNameInterface, Principal {
135137
private String rfc2253Dn; // RFC 2253 DN, or null
136138
private String canonicalDn; // canonical RFC 2253 DN or null
137139
private RDN[] names; // RDNs (never null)
138-
private X500Principal x500Principal;
140+
@Weak private X500Principal x500Principal;
139141
private byte[] encoded;
140142

141143
// cached immutable list of the RDNs and all the AVAs

0 commit comments

Comments
 (0)