1 files changed, 24 insertions, 6 deletions

diff --git a/src/main/java/org/glavo/javah/ClassPath.java b/src/main/java/org/glavo/javah/ClassPath.java
index 2aea039..3e59c59 100644
--- a/src/main/java/org/glavo/javah/ClassPath.java
+++ b/src/main/java/org/glavo/javah/ClassPath.java
@@ -1,23 +1,41 @@
 package org.glavo.javah;
 
 import java.nio.file.Path;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
+import static org.glavo.javah.Utils.*;
+
 public class ClassPath implements SearchPath {
     private final Path path;
-    private final List<Path> searchPaths;
+    private final List<Path> roots;
 
     public ClassPath(Path path) {
         Objects.requireNonNull(path);
-        this.path = path;
-        searchPaths = Utils.getPathsFrom(path);
+        this.path = path.toAbsolutePath();
+
+        Path root = classPathRoot(path);
+        roots = root == null ? Collections.emptyList() : SearchPath.multiReleaseRoots(root);
+    }
+
+    @Override
+    public Path search(ClassName name) {
+        Objects.requireNonNull(name);
+        return SearchPath.searchFromRoots(roots, name);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ClassPath classPath = (ClassPath) o;
+        return Objects.equals(path, classPath.path);
     }
 
     @Override
-    public Path searchClass(String className) {
-        Objects.requireNonNull(className);
-        return Utils.searchFrom(searchPaths, className);
+    public int hashCode() {
+        return path.hashCode();
     }
 
     @Override