You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by ni...@apache.org on 2017/05/15 07:04:06 UTC
[3/4] polygene-java git commit: Adding a missing piece to a usecase
that is probably not implemented yet (Mixins in Objects),
but this would be needed.
Adding a missing piece to a usecase that is probably not implemented yet (Mixins in Objects), but this would be needed.
Signed-off-by: niclas <ni...@hedhman.org>
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/33d4309c
Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/33d4309c
Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/33d4309c
Branch: refs/heads/develop
Commit: 33d4309c8f6906da5e162008b54a2eda48887996
Parents: f7376c1
Author: niclas <ni...@hedhman.org>
Authored: Mon May 15 14:59:25 2017 +0800
Committer: niclas <ni...@hedhman.org>
Committed: Mon May 15 14:59:25 2017 +0800
----------------------------------------------------------------------
.../apache/polygene/runtime/composite/CompositeMethodsModel.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/33d4309c/core/runtime/src/main/java/org/apache/polygene/runtime/composite/CompositeMethodsModel.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/polygene/runtime/composite/CompositeMethodsModel.java b/core/runtime/src/main/java/org/apache/polygene/runtime/composite/CompositeMethodsModel.java
index c1cd368..25b98f7 100644
--- a/core/runtime/src/main/java/org/apache/polygene/runtime/composite/CompositeMethodsModel.java
+++ b/core/runtime/src/main/java/org/apache/polygene/runtime/composite/CompositeMethodsModel.java
@@ -26,6 +26,7 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Collection;
import java.util.LinkedHashMap;
+import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.stream.Collectors;
@@ -95,7 +96,8 @@ public final class CompositeMethodsModel
}
return null;
- } ).filter( model -> model != null ).findFirst().orElse( null );
+ } ).filter( Objects::nonNull ).findFirst().orElse( null );
+ return compositeMethod.invoke( proxy, args, mixins, moduleInstance );
}
if( method.isDefault() )
{