[Wonder-cvs] CVS: Wonder/Common/Frameworks/ERDirectToWeb/Sources/er/directtoweb ERDDelayedSelectorInvocationAssignment.java, 1.1.2.2, 1.1.2.3

[Jonathan B. L. <le...@us...>]

Update of /cvsroot/wonder/Wonder/Common/Frameworks/ERDirectToWeb/Sources/er/directtoweb
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20440

Modified Files:
      Tag: Wonder_2_0_0_Branch
	ERDDelayedSelectorInvocationAssignment.java 
Log Message:
change to return null if target is null


Index: ERDDelayedSelectorInvocationAssignment.java
===================================================================
RCS file: /cvsroot/wonder/Wonder/Common/Frameworks/ERDirectToWeb/Sources/er/directtoweb/ERDDelayedSelectorInvocationAssignment.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** ERDDelayedSelectorInvocationAssignment.java	8 May 2006 17:48:20 -0000	1.1.2.2
--- ERDDelayedSelectorInvocationAssignment.java	31 Jul 2007 03:29:40 -0000	1.1.2.3
***************
*** 107,115 ****
          final NSArray value = (NSArray)value();
          final int valueCount = value.count();
-         final int numberOfArguments = valueCount - 2;
          final Object target;
!         final String selectorName;
!         final NSSelector selector;
!         Object[] arguments = null;
  
          if ( valueCount < 2 )
--- 107,112 ----
          final NSArray value = (NSArray)value();
          final int valueCount = value.count();
          final Object target;
!         Object result = null;
  
          if ( valueCount < 2 )
***************
*** 117,138 ****
  
          target = c.valueForKeyPath((String)value.objectAtIndex(0));
!         selectorName = (String)value.objectAtIndex(1);
! 
!         if ( numberOfArguments > 0 ) {
!             arguments = new Object[numberOfArguments];
! 
!             for ( int i = 2; i < valueCount; i++ )
!                 arguments[i-2] = c.valueForKeyPath((String)value.objectAtIndex(i));
!         }
! 
!         if ( _log.isDebugEnabled() ) {
!             final NSArray a = arguments != null ? new NSArray(arguments) : null;
! 
!             _log.debug("Going to fire " + selectorName + " on object " + target + " with " + numberOfArguments + " arguments: " + a);
          }
  
!         selector = new NSSelector(selectorName, _parameterTypesForNumberOfArguments(numberOfArguments));
! 
!         return ERXSelectorUtilities.invoke(selector, target, arguments);
      }
  
--- 114,142 ----
  
          target = c.valueForKeyPath((String)value.objectAtIndex(0));
!         if ( target != null ) {
!             final int numberOfArguments = valueCount - 2;
!             final String selectorName = (String)value.objectAtIndex(1);
!             final NSSelector selector;
!             Object[] arguments = null;
!     
!             if ( numberOfArguments > 0 ) {
!                 arguments = new Object[numberOfArguments];
!     
!                 for ( int i = 2; i < valueCount; i++ )
!                     arguments[i-2] = c.valueForKeyPath((String)value.objectAtIndex(i));
!             }
!     
!             if ( _log.isDebugEnabled() ) {
!                 final NSArray a = arguments != null ? new NSArray(arguments) : null;
!     
!                 _log.debug("Going to fire " + selectorName + " on object " + target + " with " + numberOfArguments + " arguments: " + a);
!             }
!     
!             selector = new NSSelector(selectorName, _parameterTypesForNumberOfArguments(numberOfArguments));
!     
!             result = ERXSelectorUtilities.invoke(selector, target, arguments);
          }
  
!         return result;
      }