deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tandrasc...@apache.org
Subject deltaspike git commit: DELTASPIKE-863 NPE when invoking proxy for custom jsf converter
Date Tue, 24 Mar 2015 21:42:35 GMT
Repository: deltaspike
Updated Branches:
  refs/heads/master 49c9a9eaf -> 846537113


DELTASPIKE-863 NPE when invoking proxy for custom jsf converter

Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/84653711
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/84653711
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/84653711

Branch: refs/heads/master
Commit: 846537113b633963da07e253edfa7596a392c684
Parents: 49c9a9e
Author: Thomas Andraschko <tandraschko@apache.org>
Authored: Tue Mar 24 22:42:25 2015 +0100
Committer: Thomas Andraschko <tandraschko@apache.org>
Committed: Tue Mar 24 22:42:25 2015 +0100

----------------------------------------------------------------------
 .../proxy/ConverterAndValidatorProxyFactory.java          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/84653711/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/injection/proxy/ConverterAndValidatorProxyFactory.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/injection/proxy/ConverterAndValidatorProxyFactory.java
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/injection/proxy/ConverterAndValidatorProxyFactory.java
index aff0bb6..d069070 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/injection/proxy/ConverterAndValidatorProxyFactory.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/injection/proxy/ConverterAndValidatorProxyFactory.java
@@ -46,18 +46,18 @@ public class ConverterAndValidatorProxyFactory extends DeltaSpikeProxyFactory
     @Override
     protected ArrayList<Method> getDelegateMethods(Class<?> targetClass, ArrayList<Method>
allMethods)
     {
-        List<Class<?>> interfaces = Arrays.asList(targetClass.getInterfaces());
-        if (!interfaces.contains(PartialStateHolder.class))
+        if (!StateHolder.class.isAssignableFrom(targetClass))
         {
             ArrayList<Method> delegateMethods = new ArrayList<Method>();
-            delegateMethods.addAll(Arrays.asList(PartialStateHolder.class.getDeclaredMethods()));
             delegateMethods.addAll(Arrays.asList(StateHolder.class.getDeclaredMethods()));
+            delegateMethods.addAll(Arrays.asList(PartialStateHolder.class.getDeclaredMethods()));
             return delegateMethods;
         }
-        if (!interfaces.contains(StateHolder.class))
+        
+        if (!PartialStateHolder.class.isAssignableFrom(targetClass))
         {
             ArrayList<Method> delegateMethods = new ArrayList<Method>();
-            delegateMethods.addAll(Arrays.asList(StateHolder.class.getDeclaredMethods()));
+            delegateMethods.addAll(Arrays.asList(PartialStateHolder.class.getDeclaredMethods()));
             return delegateMethods;
         }
         


Mime
View raw message