openamf/src/java/org/openamf/config OpenAMFConfig.java,1.2,1.3

Update of /cvsroot/openamf/openamf/src/java/org/openamf/config
In directory sc8-pr-cvs1:/tmp/cvs-serv2283/src/java/org/openamf/config

Modified Files:
	OpenAMFConfig.java 
Log Message:
added check so null values aren't added to an array

Index: OpenAMFConfig.java
===================================================================
RCS file: /cvsroot/openamf/openamf/src/java/org/openamf/config/OpenAMFConfig.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OpenAMFConfig.java	6 Jul 2003 17:27:34 -0000	1.2
--- OpenAMFConfig.java	26 Jul 2003 00:13:57 -0000	1.3
***************
*** 56,60 ****
  	}
  	
! 	public String getCustomClassName(String javaClassName) {
  		String customClassName = null;
  		
--- 56,64 ----
  	}
  	
! 	public Iterator getCustomClassMappingConfigs() {
! 		return customClassMappingConfigs.iterator();
! 	}
! 
!  	public String getCustomClassName(String javaClassName) {
  		String customClassName = null;
  		
***************
*** 63,84 ****
  			CustomClassMappingConfig ccm = (CustomClassMappingConfig) i.next();
  			
- 			String tempCCName = javaClassName;
- 			if (ccm.getCustomClassName() != null) {
- 				tempCCName = ccm.getCustomClassName();
- 			}
- 			log.debug("ccm.getCustomClassName(): " + ccm.getCustomClassName());
- 			log.debug("ccm.getJavaClassName(): " + ccm.getJavaClassName());
- 			
  			if (ccm.getJavaClassName().equals(javaClassName)) {
! 				customClassName = tempCCName;
  				break;
- 			} else if (ccm.getJavaClassName().equals("*")) {
- 				customClassName = tempCCName;
- 			} else if (ccm.getJavaClassName().endsWith("*")) {
- 				int starIndex = ccm.getJavaClassName().lastIndexOf('*');
- 				String packageName = ccm.getJavaClassName().substring(0, starIndex);
- 				if (javaClassName.startsWith(packageName)) {
- 					customClassName = tempCCName;
- 				}
  			}
  		}
--- 67,73 ----
  			CustomClassMappingConfig ccm = (CustomClassMappingConfig) i.next();
  			
  			if (ccm.getJavaClassName().equals(javaClassName)) {
! 				customClassName = ccm.getCustomClassName();
  				break;
  			}
  		}
***************
*** 87,92 ****
  	}
  
! 	public Iterator getCustomClassMappingConfigs() {
! 		return customClassMappingConfigs.iterator();
  	}
  
--- 76,93 ----
  	}
  
! 	public String getJavaClassName(String customClassName) {
! 		String javaClassName = null;
! 		
! 		log.debug("Looking for: " + customClassName);
! 		for (Iterator i = customClassMappingConfigs.iterator(); i.hasNext();) {
! 			CustomClassMappingConfig ccm = (CustomClassMappingConfig) i.next();
! 			
! 			if (ccm.getCustomClassName().equals(customClassName)) {
! 				javaClassName = ccm.getJavaClassName();
! 				break;
! 			}
! 		}
! 		
! 		return javaClassName;
  	}
  




-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01