openamf/src/java/org/openamf/util OpenAMFUtils.java,1.1,1.2

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

Modified Files:
	OpenAMFUtils.java 
Log Message:
fixed bug with HashMap parameters

Index: OpenAMFUtils.java
===================================================================
RCS file: /cvsroot/openamf/openamf/src/java/org/openamf/util/OpenAMFUtils.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OpenAMFUtils.java	6 Jul 2003 17:26:29 -0000	1.1
--- OpenAMFUtils.java	15 Jul 2003 22:10:54 -0000	1.2
***************
*** 1,4 ****
--- 1,7 ----
  package org.openamf.util;
  
+ import java.util.HashMap;
+ import java.util.Map;
+ 
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
***************
*** 6,9 ****
--- 9,13 ----
  
  import com.carbonfive.flash.decoder.ActionScriptDecoder;
+ import com.carbonfive.flash.decoder.CachingDecoder;
  import com.carbonfive.flash.decoder.DecoderFactory;
  
***************
*** 14,17 ****
--- 18,23 ----
  	public static Object decodeParameter(Object parameter, Class parameterType) {
  
+ 		log.debug("Decoding parameter: " + parameter + " to type: " + parameterType);
+ 
  		if (parameter == null) {
  			try {
***************
*** 37,46 ****
  			&& ((ASObject) parameter).getType() == null) {
  
! 			setType = true;
! 			((ASObject) parameter).setType(parameterType.getName());
  		}
  
  		ActionScriptDecoder decoder =
  			decoderFactory.getDecoder(parameter, parameterType);
  		Object decodedObject = decoder.decodeObject(parameter, parameterType);
  
--- 43,57 ----
  			&& ((ASObject) parameter).getType() == null) {
  
! 			if (parameterType.equals(HashMap.class) || parameterType.equals(Map.class)) {
! 				//don't set type
! 			} else { 
! 				setType = true;
! 				((ASObject) parameter).setType(parameterType.getName());
! 			}
  		}
  
  		ActionScriptDecoder decoder =
  			decoderFactory.getDecoder(parameter, parameterType);
+ 		log.debug("decoder: " + ((CachingDecoder)decoder).getNextDecoder().getClass().getName());
  		Object decodedObject = decoder.decodeObject(parameter, parameterType);
  
***************
*** 51,54 ****
--- 62,68 ----
  			decodedObject = decoder.decodeObject(parameter, parameterType);
  		}
+ 
+ 		log.debug("decodedObject: " + decodedObject);
+ 
  		return decodedObject;
  	}
***************
*** 57,62 ****
  	public static boolean typesMatch(Class parameterType, Object parameter) {
  
! 		//log.debug("expected class: " + parameterType.getName());
! 		//log.debug("parameter class: " + parameter.getClass().getName());
  
  		boolean typesMatch = parameterType.isInstance(parameter);
--- 71,76 ----
  	public static boolean typesMatch(Class parameterType, Object parameter) {
  
! 		log.debug("expected class: " + parameterType.getName());
! 		log.debug("parameter class: " + parameter.getClass().getName());
  
  		boolean typesMatch = parameterType.isInstance(parameter);




-------------------------------------------------------
This SF.net email is sponsored by: VM Ware
With VMware you can run multiple operating systems on a single machine.
WITHOUT REBOOTING! Mix Linux / Windows / Novell virtual machines at the
same time. Free trial click here: http://www.vmware.com/wl/offer/345/0