Commits

Anonymous committed 155d35a

o better fix for LocalizedTextUtilTest

git-svn-id: http://svn.opensymphony.com/svn/xwork/trunk@671e221344d-f017-0410-9bd5-d282ab1896d7

  • Participants
  • Parent commits f279b19

Comments (0)

Files changed (2)

File src/java/com/opensymphony/xwork/util/InstantiatingNullHandler.java

     }
 
     public Object nullPropertyValue(Map context, Object target, Object property) {
-    	LOG.debug("Entering nullPropertyValue [target="+target+", property="+property+"]");
+    	LOG.debug("Entering nullPropertyValue [context="+context+", target="+target+", property="+property+"]");
     	boolean c = OgnlContextState.isCreatingNullObjects(context);
 
         if (!c) {

File src/test/com/opensymphony/xwork/util/LocalizedTextUtilTest.java

             bean.setBarObj(bar);
 
             Mock mockActionInvocation = new Mock(ActionInvocation.class);
+            mockActionInvocation.expectAndReturn("hashCode", 0);
             mockActionInvocation.expectAndReturn("getAction", action);
             ActionContext.getContext().setActionInvocation((ActionInvocation) mockActionInvocation.proxy());
             ActionContext.getContext().getValueStack().push(action);