openamf/src/java/org/openamf/io AMFDeserializer.java,1.21,1.22

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

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

Index: AMFDeserializer.java
===================================================================
RCS file: /cvsroot/openamf/openamf/src/java/org/openamf/io/AMFDeserializer.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** AMFDeserializer.java	21 Jul 2003 23:36:10 -0000	1.21
--- AMFDeserializer.java	26 Jul 2003 00:14:16 -0000	1.22
***************
*** 14,17 ****
--- 14,18 ----
  import org.openamf.AMFMessage;
  import org.openamf.ASObject;
+ import org.openamf.config.OpenAMFConfig;
  import org.w3c.dom.Document;
  import org.xml.sax.InputSource;
***************
*** 20,24 ****
  
  	private static Log log = LogFactory.getLog(AMFDeserializer.class);
! 	
  	private ArrayList storedObjects;
  
--- 21,25 ----
  
  	private static Log log = LogFactory.getLog(AMFDeserializer.class);
! 
  	private ArrayList storedObjects;
  
***************
*** 120,125 ****
  		String type = inputStream.readUTF();
  		log.debug("Reading Custom Class: " + type);
  		ASObject aso = new ASObject(type);
! 		
  		// The rest of the bytes are an object without the 0x03 header
  		return readObject(aso);
--- 121,133 ----
  		String type = inputStream.readUTF();
  		log.debug("Reading Custom Class: " + type);
+ 
+ 		String mappedJavaClass =
+ 			OpenAMFConfig.getInstance().getJavaClassName(type);
+ 		if (mappedJavaClass != null) {
+ 			type = mappedJavaClass;
+ 		}
+ 
  		ASObject aso = new ASObject(type);
! 
  		// The rest of the bytes are an object without the 0x03 header
  		return readObject(aso);
***************
*** 134,138 ****
  
  		storeObject(aso);
! 		
  		// Init the array
  		log.debug("reading object");
--- 142,146 ----
  
  		storeObject(aso);
! 
  		// Init the array
  		log.debug("reading object");
***************
*** 185,198 ****
  			byte type = inputStream.readByte();
  			// Grab the element
! 			array.add(readData(type));
  		}
  
- 
  		// Return the data
  		return array;
  	}
! 	
  	private void storeObject(Object o) {
! 		storedObjects.add(o);		
  		log.debug("storedObjects.size: " + storedObjects.size());
  	}
--- 193,208 ----
  			byte type = inputStream.readByte();
  			// Grab the element
! 			Object data = readData(type);
! 			if (data != null) {
! 				array.add(data);
! 			}
  		}
  
  		// Return the data
  		return array;
  	}
! 
  	private void storeObject(Object o) {
! 		storedObjects.add(o);
  		log.debug("storedObjects.size: " + storedObjects.size());
  	}




-------------------------------------------------------
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