stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6856069: PrincipalName.clone() does not invoke super.clone()

Browse Source 
Reviewed-by: chegar
This commit is contained in:
Weijun Wang 2010-04-22 12:45:36 +08:00
parent 09ae7d4842
commit 7cc72590c7
2 changed files with 55 additions and 13 deletions
jdk
src/share/classes/sun/security/krb5
PrincipalName.java
test/sun/security/krb5
ServiceNameClone.java

27
jdk/src/share/classes/sun/security/krb5/PrincipalName.java

@ -1,5 +1,5 @@
/*
* Portions Copyright 2000-2009 Sun Microsystems, Inc. All Rights Reserved.
* Portions Copyright 2000-2010 Sun Microsystems, Inc. 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
@ -101,7 +101,7 @@ public class PrincipalName
private Realm nameRealm; // optional; a null realm means use default
// Note: the nameRealm is not included in the default ASN.1 encoding
// salt for principal
// cached salt, might be changed by KDC info, not used in clone
private String salt = null;
protected PrincipalName() {
@ -123,18 +123,19 @@ public class PrincipalName
}
public Object clone() {
PrincipalName pName = new PrincipalName();
pName.nameType = nameType;
if (nameStrings != null) {
pName.nameStrings =
new String[nameStrings.length];
System.arraycopy(nameStrings,0,pName.nameStrings,0,
nameStrings.length);
try {
PrincipalName pName = (PrincipalName) super.clone();
// Re-assign mutable fields
if (nameStrings != null) {
pName.nameStrings = nameStrings.clone();
}
if (nameRealm != null) {
pName.nameRealm = (Realm)nameRealm.clone();
}
return pName;
} catch (CloneNotSupportedException ex) {
throw new AssertionError("Should never happen");
}
if (nameRealm != null) {
pName.nameRealm = (Realm)nameRealm.clone();
}
return pName;
}
/*

41
jdk/test/sun/security/krb5/ServiceNameClone.java Normal file

@ -0,0 +1,41 @@
/*
* Copyright 2010 Sun Microsystems, Inc. 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
/*
* @test
* @bug 6856069
* @summary PrincipalName.clone() does not invoke super.clone()
*/
import sun.security.krb5.ServiceName;
public class ServiceNameClone {
public static void main(String[] args) throws Exception {
ServiceName sn = new ServiceName("me@HERE");
if (sn.clone().getClass() != ServiceName.class) {
throw new Exception("ServiceName's clone is not a ServiceName");
}
if (!sn.clone().equals(sn)) {
throw new Exception("ServiceName's clone changed");
}
}
}