[Mocklib-checkins] mocklib2/input/javasrc/biz/xsoftware/mock MockSuperclass.java, 1.10, 1.11

[dadrox <da...@us...>]

Update of /cvsroot/mocklib/mocklib2/input/javasrc/biz/xsoftware/mock
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28184/input/javasrc/biz/xsoftware/mock

Modified Files:
	MockSuperclass.java 
Log Message:
fixed default returns bug

Index: MockSuperclass.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib2/input/javasrc/biz/xsoftware/mock/MockSuperclass.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** MockSuperclass.java	7 Aug 2006 15:52:45 -0000	1.10
--- MockSuperclass.java	25 Aug 2006 17:26:29 -0000	1.11
***************
*** 191,198 ****
  		
  		this.notifyAll();
- 		
-         Object defaultVal = methodToDefaultRetVal.get(method);
-         if(defaultVal != null)
-             return defaultVal;
              
          return findNextAction(method, parameters);
--- 191,194 ----
***************
*** 202,210 ****
          List l = (List)methodToReturnVal.get(method);
          if(l == null)
!             return null;
          
          Object retVal = l.remove(0);
          if(l.size()<=0)
              methodToReturnVal.remove(method);
          
          if(retVal instanceof Behavior) {
--- 198,210 ----
          List l = (List)methodToReturnVal.get(method);
          if(l == null)
!         {
!             return methodToDefaultRetVal.get(method);
!         }
          
          Object retVal = l.remove(0);
          if(l.size()<=0)
              methodToReturnVal.remove(method);
+         else if(retVal == null)
+             methodToDefaultRetVal.get(method);
          
          if(retVal instanceof Behavior) {