Spring/spring-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolves JIRA issue SGF-235 fixing the NullPointerException in the DefaultFunctionArgumentResolver when the FunctionContext.getArguments method has no arguments, or incorrectly returns a null value.

Browse Source
This commit is contained in:
John Blum
2013-11-21 20:58:05 -08:00
parent f3b22622b1
commit f8368c72e8
2 changed files with 46 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/org/springframework/data/gemfire/function/DefaultFunctionArgumentResolver.java
View File

@@ -16,21 +16,29 @@ import com.gemstone.gemfire.cache.execute.FunctionContext;
/**
* @author David Turanski
* @author John Blum
* @since 1.3.0
*
*/
class DefaultFunctionArgumentResolver implements FunctionArgumentResolver {
private static final Object[] EMPTY_ARRAY = new Object[0];
/* (non-Javadoc)
* @see org.springframework.data.gemfire.function.FunctionArgumentResolver#resolveFunctionArguments(com.gemstone.gemfire.cache.execute.FunctionContext)
*/
@Override
public Object[] resolveFunctionArguments(FunctionContext functionContext) {
public Object[] resolveFunctionArguments(final FunctionContext functionContext) {
return (isArray(functionContext.getArguments())) ? (Object[]) functionContext.getArguments()
: getArguments(functionContext);
}
Object[] args = (functionContext.getArguments().getClass().isArray()) ? (Object[]) functionContext
.getArguments() : new Object[] { functionContext.getArguments() };
return args;
private boolean isArray(final Object value) {
return (value != null && value.getClass().isArray());
}
private Object[] getArguments(final FunctionContext context) {
final Object arguments = context.getArguments();
return (arguments != null ? new Object[] { arguments } : EMPTY_ARRAY);
}
}