Skip to content

Commit d14db85

Browse files
committed
fixed some path relativization error
1 parent 59d0e1f commit d14db85

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

src/main/java/de/unirostock/sems/cbarchive/web/importer/GitImporter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ private void zipIt(File output, File baseDir) throws ImporterException {
273273

274274
for( File file : fileList ) {
275275
// add entry
276-
ZipEntry entry = new ZipEntry( file.toPath().relativize(basePath).toString() );
276+
ZipEntry entry = new ZipEntry( basePath.relativize(file.toPath()).toString() );
277277
zipOutput.putNextEntry(entry);
278278

279279
// copy data
@@ -300,7 +300,7 @@ private void generateFileList(File node, List<File> fileList) {
300300
if( node.isFile() ) {
301301
fileList.add(node);
302302
}
303-
else if( node.isDirectory() ) {
303+
else if( node.isDirectory() && !(node.getName().equals(".") || node.getName().equals("..")) ) {
304304
// node is a directory -> dive into
305305
String[] subNode = node.list();
306306
for( String name : subNode ) {

0 commit comments

Comments
 (0)