20240524

thevpc · May 24, 2024 · 9bd48de · 9bd48de
1 parent e0765b6
commit 9bd48de
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...ts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/io/path/DirectoryScanner.java b/...ts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/io/path/DirectoryScanner.java
@@ -120,7 +120,7 @@ private NStream<NPath> stream(NPath r, PathPart[] parts, int from) {
                 } else {
                     int i0 = i;
                     NFunction<NPath, NStream<NPath>> f = NFunction.of((NPath x) -> stream(x, parts, i0 + 1)).withDesc(NEDesc.of("subStream"));
-                    return t.flatMap((NFunction) f);
+                    return t.flatMapStream((NFunction) f);
                 }
             } else if (parts[i] instanceof SubPathWildCardPathPart) {
                 SubPathWildCardPathPart w = (SubPathWildCardPathPart) parts[i];
@@ -135,7 +135,7 @@ private NStream<NPath> stream(NPath r, PathPart[] parts, int from) {
                     int i0 = i;
 
                     NFunction<NPath, NStream<NPath>> f = NFunction.of((NPath x) -> stream(x, parts, i0 + 1)).withDesc(NEDesc.of("subStream"));
-                    return t.flatMap((NFunction) f).distinct();
+                    return t.flatMapStream((NFunction) f).distinct();
                 }
             } else {
                 throw new NIllegalArgumentException(session, NMsg.ofC("unsupported %s",parts[i]));
@@ -193,7 +193,7 @@ public SubPathWildCardPathPart(String value) {
         }
 
         public boolean matchesSubPath(NPath subPath) {
-            return pattern.matcher(subPath.toString()).matches();
+            return pattern.matcher((subPath==null?"":subPath.toString())).matches();
         }
 
         @Override