[ignite-3] branch ignite-13618 updated: Rewrite to VarHandles. Improve serializer API.

[amashenkov]

This is an automated email from the ASF dual-hosted git repository.

amashenkov pushed a commit to branch ignite-13618
in repository https://gitbox.apache.org/repos/asf/ignite-3.git


The following commit(s) were added to refs/heads/ignite-13618 by this push:
     new 27b9f5f  Rewrite to VarHandles. Improve serializer API.
27b9f5f is described below

commit 27b9f5f49578ffe69fc73705f5692c9eacebff97
Author: Andrew Mashenkov <andrey.mashen...@gmail.com>
AuthorDate: Thu Dec 17 01:43:43 2020 +0300

    Rewrite to VarHandles.
    Improve serializer API.
---
 .../org/apache/ignite/internal/schema/marshaller/CompilerUtils.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/CompilerUtils.java
 
b/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/CompilerUtils.java
index 0edaf68..138c41b 100644
--- 
a/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/CompilerUtils.java
+++ 
b/modules/commons/src/main/java/org/apache/ignite/internal/schema/marshaller/CompilerUtils.java
@@ -225,12 +225,13 @@ public final class CompilerUtils {
             boolean recurse) throws IOException {
             final Iterable<JavaFileObject> it = super.list(location, 
packageName, kinds, recurse);
 
-            if (location == StandardLocation.CLASS_PATH) {
+            if (location == StandardLocation.CLASS_PATH && 
!classesBytes.isEmpty()) {
                 assert kinds.contains(JavaFileObject.Kind.CLASS);
 
                 Iterable<JavaFileObject> localClasses = new Iterable<>() {
                     @Override public Iterator<JavaFileObject> iterator() {
                         return classesBytes.keySet().stream()
+                            .filter(cn -> !recurse || cn.lastIndexOf('.') == 
packageName.length())
                             .filter(cn -> cn.startsWith(packageName))
                             .map(cn -> getJavaFileObjectByName(cn))
                             .filter(Objects::nonNull).iterator();