You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by or...@apache.org on 2005/09/06 02:52:24 UTC
svn commit: r278896 -
/myfaces/impl/trunk/src/java/org/apache/myfaces/el/PropertyResolverImpl.java
Author: oros
Date: Mon Sep 5 17:52:19 2005
New Revision: 278896
URL: http://svn.apache.org/viewcvs?rev=278896&view=rev
Log:
fix: getType for primitive arrays
Modified:
myfaces/impl/trunk/src/java/org/apache/myfaces/el/PropertyResolverImpl.java
Modified: myfaces/impl/trunk/src/java/org/apache/myfaces/el/PropertyResolverImpl.java
URL: http://svn.apache.org/viewcvs/myfaces/impl/trunk/src/java/org/apache/myfaces/el/PropertyResolverImpl.java?rev=278896&r1=278895&r2=278896&view=diff
==============================================================================
--- myfaces/impl/trunk/src/java/org/apache/myfaces/el/PropertyResolverImpl.java (original)
+++ myfaces/impl/trunk/src/java/org/apache/myfaces/el/PropertyResolverImpl.java Mon Sep 5 17:52:19 2005
@@ -297,17 +297,21 @@
public Class getType(Object base, int index)
{
- try
+ if (base == null)
{
- if (base == null)
- {
- throw new PropertyNotFoundException("Bean is null");
- }
+ throw new PropertyNotFoundException("Bean is null");
+ }
+ try
+ {
if (base.getClass().isArray())
{
- Object[] array = (Object[]) base;
- return array[index].getClass().getComponentType();
+ if (base instanceof Object[]) {
+ Object[] array = (Object[]) base;
+ return array[index].getClass().getComponentType();
+ } else {
+ return base.getClass().getComponentType();
+ }
}
if (base instanceof List)