fix for Schema retrieval crashes, bug 232298

directory/java-sdk/ldapjdk/netscape/ldap/LDAPMatchingRuleSchema.java

@@ -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" );
+	Object p = properties.get( "APPLIES" );
-        if ( v != null ) {
+	if ( p instanceof Vector ) {
-            attributes = new String[v.size()];
+		Vector v = (Vector) p;
-            v.copyInto( attributes );
+		if ( v != null ) {
-            v.removeAllElements();
+			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;

directory/java-sdk/ldapjdk/netscape/ldap/LDAPMatchingRuleUseSchema.java

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