Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for Schema retrieval crashes, bug 232298

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@153245 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
etsai%netscape.com
2004-02-25 23:11:43 +00:00
parent e7c0879e21
commit e69bb19115
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPMatchingRuleSchema.java
View File

@@ -18,6 +18,7 @@
* Rights Reserved.
*
* Contributor(s):
* Ingo Schaefer (ingo.schaefer@fh-brandenburg.de)
*/
package netscape.ldap;
@@ -220,12 +221,19 @@ public class LDAPMatchingRuleSchema extends LDAPAttributeSchema {
if ( use != null ) {
parseValue( use );
}
Vector v = (Vector)properties.get( "APPLIES" );
if ( v != null ) {
attributes = new String[v.size()];
v.copyInto( attributes );
v.removeAllElements();
Object p = properties.get( "APPLIES" );
if ( p instanceof Vector ) {
Vector v = (Vector) p;
if ( v != null ) {
attributes = new String[v.size()];
v.copyInto( attributes );
v.removeAllElements();
}
}
else if ( p instanceof String ) {
attributes = new String[1];
attributes[0] = (String) p;
}
String val = (String)properties.get( "SYNTAX" );
if ( val != null ) {
syntaxElement.syntaxString = val;

17
mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPMatchingRuleUseSchema.java
View File

@@ -132,11 +132,18 @@ public class LDAPMatchingRuleUseSchema extends LDAPAttributeSchema {
public LDAPMatchingRuleUseSchema( String use ) {
attrName = "matchingruleuse";
parseValue( use );
Vector v = (Vector)properties.get( "APPLIES" );
if ( v != null ) {
attributes = new String[v.size()];
v.copyInto( attributes );
v.removeAllElements();
Object p = properties.get( "APPLIES" );
if ( p instanceof Vector ) {
Vector v = (Vector)p;
if ( v != null ) {
attributes = new String[v.size()];
v.copyInto( attributes );
v.removeAllElements();
}
}
else if ( p instanceof String ) {
attributes = new String[1];
attributes[0] = (String)p;
}
}