You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ml...@apache.org on 2006/10/12 13:16:56 UTC
svn commit: r463197 - in
/incubator/harmony/enhanced/classlib/trunk/modules/security/src:
main/java/common/java/security/Identity.java
test/api/java/org/apache/harmony/security/tests/java/security/Identity2Test.java
Author: mloenko
Date: Thu Oct 12 04:16:55 2006
New Revision: 463197
URL: http://svn.apache.org/viewvc?view=rev&rev=463197
Log:
applied patch from HARMONY-1566
[classlib][security] Identity.toString() returns string on RI and 'null' on Harmony
Modified:
incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Identity.java
incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Identity2Test.java
Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Identity.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Identity.java?view=diff&rev=463197&r1=463196&r2=463197
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Identity.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Identity.java Thu Oct 12 04:16:55 2006
@@ -253,7 +253,7 @@
if (sm != null) {
sm.checkSecurityAccess("printIdentity"); //$NON-NLS-1$
}
- String s = this.name;
+ String s = (this.name == null? "" : this.name);
if (scope != null) {
s += " [" + scope.getName() + "]"; //$NON-NLS-1$ //$NON-NLS-2$
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Identity2Test.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Identity2Test.java?view=diff&rev=463197&r1=463196&r2=463197
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Identity2Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Identity2Test.java Thu Oct 12 04:16:55 2006
@@ -288,6 +288,8 @@
assertNotNull(sub.toString());
assertTrue("The String returned is not valid", sub.toString()
.length() > 0);
+ // Regression for HARMONY-1566
+ assertNotNull(new IdentitySubclass().toString());
}
/**