You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mc...@apache.org on 2013/03/25 20:51:36 UTC
svn commit: r1460861 - in
/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl: ./
internal/ internal/entry/
Author: mcucchiara
Date: Mon Mar 25 19:51:36 2013
New Revision: 1460861
URL: http://svn.apache.org/r1460861
Log:
Combined nested if statements
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/SimpleNode.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ToStringVisitor.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheHandler.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ConcurrentHashMapCache.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/HashMapCache.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ReentrantReadWriteLockCache.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/PropertyDescriptorCacheEntryFactory.java
Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java?rev=1460861&r1=1460860&r2=1460861&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java Mon Mar 25 19:51:36 2013
@@ -477,12 +477,9 @@ public class OgnlRuntime
{
Object result;
- if ( securityManager != null )
+ if ( securityManager != null && !cache.getMethodPerm( method ) )
{
- if ( !cache.getMethodPerm( method ) )
- {
- throw new IllegalAccessException( "Method [" + method + "] cannot be accessed." );
- }
+ throw new IllegalAccessException( "Method [" + method + "] cannot be accessed." );
}
MethodAccessEntryValue entry = cache.getMethodAccess( method );
@@ -2031,9 +2028,8 @@ public class OgnlRuntime
}
else if ( numParms < 0 )
{
- if ( ( method != null
- && method.getParameterTypes().length > methodDescriptor.getMethod().getParameterTypes().length )
- || method == null )
+ if ( method == null || ( method.getParameterTypes().length
+ > methodDescriptor.getMethod().getParameterTypes().length ) )
{
method = methodDescriptor.getMethod();
}
Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/SimpleNode.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/SimpleNode.java?rev=1460861&r1=1460860&r2=1460861&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/SimpleNode.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/SimpleNode.java Mon Mar 25 19:51:36 2013
@@ -382,13 +382,11 @@ public abstract class SimpleNode
}
for ( Node child : children )
{
- if ( child instanceof SimpleNode )
+ if ( child instanceof SimpleNode && ( (SimpleNode) child ).isEvalChain( context ) )
{
- if ( ( (SimpleNode) child ).isEvalChain( context ) )
- {
- return true;
- }
+ return true;
}
+
}
return false;
}
Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ToStringVisitor.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ToStringVisitor.java?rev=1460861&r1=1460860&r2=1460861&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ToStringVisitor.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ToStringVisitor.java Mon Mar 25 19:51:36 2013
@@ -241,13 +241,10 @@ public class ToStringVisitor
{
for ( int i = 0; i < node.children.length; i++ )
{
- if ( i > 0 )
+ if ( i > 0 && !( node.children[i] instanceof ASTProperty )
+ || !( (ASTProperty) node.children[i] ).isIndexedAccess() )
{
- if ( !( node.children[i] instanceof ASTProperty )
- || !( (ASTProperty) node.children[i] ).isIndexedAccess() )
- {
- data.append( "." );
- }
+ data.append( "." );
}
recurse( node.children[i], data );
}
Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheHandler.java?rev=1460861&r1=1460860&r2=1460861&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheHandler.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheHandler.java Mon Mar 25 19:51:36 2013
@@ -78,12 +78,9 @@ public class ClassCacheHandler
}
}
}
- if ( answer != null )
+ if ( answer != null && keyFound != forClass )
{
- if ( keyFound != forClass )
- {
- handlers.put( forClass, answer );
- }
+ handlers.put( forClass, answer );
}
}
}
Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ConcurrentHashMapCache.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ConcurrentHashMapCache.java?rev=1460861&r1=1460860&r2=1460861&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ConcurrentHashMapCache.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ConcurrentHashMapCache.java Mon Mar 25 19:51:36 2013
@@ -66,14 +66,7 @@ public class ConcurrentHashMapCache<K, V
protected boolean shouldCreate( CacheEntryFactory<K, V> cacheEntryFactory, V v )
throws CacheException
{
- if ( cacheEntryFactory != null )
- {
- if ( v == null )
- {
- return true;
- }
- }
- return false;
+ return cacheEntryFactory != null && v == null;
}
public V put( K key, V value )
Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/HashMapCache.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/HashMapCache.java?rev=1460861&r1=1460860&r2=1460861&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/HashMapCache.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/HashMapCache.java Mon Mar 25 19:51:36 2013
@@ -78,14 +78,7 @@ public class HashMapCache<K, V>
protected boolean shouldCreate( CacheEntryFactory<K, V> cacheEntryFactory, V v )
throws CacheException
{
- if ( cacheEntryFactory != null )
- {
- if ( v == null )
- {
- return true;
- }
- }
- return false;
+ return cacheEntryFactory != null && v == null;
}
public V put( K key, V value )
Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ReentrantReadWriteLockCache.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ReentrantReadWriteLockCache.java?rev=1460861&r1=1460860&r2=1460861&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ReentrantReadWriteLockCache.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ReentrantReadWriteLockCache.java Mon Mar 25 19:51:36 2013
@@ -112,14 +112,7 @@ public class ReentrantReadWriteLockCache
protected boolean shouldCreate( CacheEntryFactory<K, V> cacheEntryFactory, V v )
throws CacheException
{
- if ( cacheEntryFactory != null )
- {
- if ( v == null )
- {
- return true;
- }
- }
- return false;
+ return cacheEntryFactory != null && v == null;
}
public V put( K key, V value )
Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/PropertyDescriptorCacheEntryFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/PropertyDescriptorCacheEntryFactory.java?rev=1460861&r1=1460860&r2=1460861&view=diff
==============================================================================
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/PropertyDescriptorCacheEntryFactory.java (original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/PropertyDescriptorCacheEntryFactory.java Mon Mar 25 19:51:36 2013
@@ -161,27 +161,23 @@ public class PropertyDescriptorCacheEntr
( setMethod == method1 ) ? method2 : method1;
Class<?> keyType = getMethod.getParameterTypes()[0], propertyType = getMethod.getReturnType();
- if ( keyType == setMethod.getParameterTypes()[0] )
+ if ( keyType == setMethod.getParameterTypes()[0] && propertyType == setMethod.getParameterTypes()[1] )
{
- if ( propertyType == setMethod.getParameterTypes()[1] )
- {
- ObjectIndexedPropertyDescriptor propertyDescriptor;
+ ObjectIndexedPropertyDescriptor propertyDescriptor;
- try
- {
- propertyDescriptor =
- new ObjectIndexedPropertyDescriptor( propertyName, propertyType, getMethod, setMethod );
- }
- catch ( Exception ex )
- {
- throw new OgnlException(
- "creating object indexed property descriptor for '" + propertyName + "' in "
- + targetClass, ex );
- }
- intoMap.put( propertyName, propertyDescriptor );
+ try
+ {
+ propertyDescriptor =
+ new ObjectIndexedPropertyDescriptor( propertyName, propertyType, getMethod, setMethod );
+ }
+ catch ( Exception ex )
+ {
+ throw new OgnlException(
+ "creating object indexed property descriptor for '" + propertyName + "' in "
+ + targetClass, ex );
}
+ intoMap.put( propertyName, propertyDescriptor );
}
-
}
}
}