Author: simonetripodi
Date: Sat May 14 11:49:02 2011
New Revision: 1103065
URL: http://svn.apache.org/viewvc?rev=1103065&view=rev
Log:
OgnlContext#get(Object) method can never throw IAE becasue key is already
checked is a reserved key
Modified:
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java
Modified:
incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java
URL:
http://svn.apache.org/viewvc/incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java?rev=1103065&r1=1103064&r2=1103065&view=diff
==============================================================================
--- incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java
(original)
+++ incubator/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java
Sat May 14 11:49:02 2011
@@ -492,7 +492,7 @@ public class OgnlContext extends Object
public Object get(Object key)
{
- Object result;
+ Object result = null;
if ( RESERVED_KEYS.contains( key ) )
{
@@ -532,10 +532,6 @@ public class OgnlContext extends Object
{
result = getMemberAccess();
}
- else
- {
- throw new IllegalArgumentException( "unknown reserved key '" +
key + "'" );
- }
}
else
{