Author: laurieh
Date: Mon Nov 28 21:29:34 2005
New Revision: 349654
URL: http://svn.apache.org/viewcvs?rev=349654&view=rev
Log:
Reverting r349286, which breaks some of the tests now in the exercises app.
Modified:
struts/action/trunk/src/java/org/apache/struts/util/DynaBeanInterceptor.java
Modified:
struts/action/trunk/src/java/org/apache/struts/util/DynaBeanInterceptor.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/src/java/org/apache/struts/util/DynaBeanInterceptor.java?rev=349654&r1=349653&r2=349654&view=diff
==============================================================================
---
struts/action/trunk/src/java/org/apache/struts/util/DynaBeanInterceptor.java
(original)
+++
struts/action/trunk/src/java/org/apache/struts/util/DynaBeanInterceptor.java
Mon Nov 28 21:29:34 2005
@@ -116,10 +116,10 @@
// Create the indexed getter/setter method pair
if (dynaProperties[i].isIndexed()) {
- Type itype = Type.getType(Integer.TYPE);
+ Type itype = Type.getType(Integer.class);
ttype = Type.getType((type.isArray() ?
type.getComponentType() : Object.class));
Signature indexGetter = new Signature(getterName, ttype,
new Type[] { itype });
- Signature indexSetter = new Signature(setterName,
Type.VOID_TYPE, new Type[] { itype, ttype });
+ Signature indexSetter = new Signature(setterName,
Type.VOID_TYPE, new Type[] { ttype, itype });
im.add(indexGetter, Constants.TYPES_EMPTY);
im.add(indexSetter, Constants.TYPES_EMPTY);
}
@@ -180,9 +180,9 @@
if (args.length == 1) {
dynaBean.set(property, args[0]);
return null;
- } else if(args.length == 2 && args[0].getClass() == Integer.class)
{
- int index = ((Integer)args[0]).intValue();
- dynaBean.set(property, index, args[1]);
+ } else if(args.length == 2 && args[1].getClass() == Integer.class)
{
+ int index = ((Integer)args[1]).intValue();
+ dynaBean.set(property, index, args[0]);
return null;
} else {
return proxy.invokeSuper(obj, args);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
