Skip to content

Fix the always null in log #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ruhan1 merged 1 commit into from
Jul 23, 2025
Merged

Fix the always null in log #122

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ...stax/src/main/java/org/commonjava/storage/pathmapped/pathdb/datastax/CassandraPathDB.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,12 +632,12 @@ public boolean delete( String fileSystem, String path, boolean force )
PathMap pathMap = getPathMap( fileSystem, path );
if ( pathMap == null )
{
logger.debug( "File not exists, {}", pathMap );
logger.debug( "File or directory not exists, {}", path );
return true;
}

String fileId = pathMap.getFileId();
if ( fileId == null )
if ( fileId == null ) // dir
{
// force or empty dir
if ( force || isEmptyDirectory( fileSystem, path ) )
Expand Down Expand Up @@ -689,8 +689,8 @@ private void postDeletionActions(String fileSystem, String path, PathMap pathMap

private boolean isEmptyDirectory( String fileSystem, String path )
{
path = PathMapUtils.normalizeParentPath( path );
BoundStatement bound = preparedListCheckEmpty.bind( fileSystem, path );
String normalized = PathMapUtils.normalizeParentPath( path );
BoundStatement bound = preparedListCheckEmpty.bind( fileSystem, normalized );
ResultSet result = executeSession( bound );
Row row = result.one();
boolean empty = false;
Expand All @@ -699,7 +699,7 @@ private boolean isEmptyDirectory( String fileSystem, String path )
long count = row.get( 0, Long.class );
empty = count <= 0;
}
logger.trace( "Dir '{}' is {} in fileSystem '{}'", path, ( empty ? "empty" : "not empty" ), fileSystem );
logger.trace( "Dir '{}' is {} in fileSystem '{}'", normalized, ( empty ? "empty" : "not empty" ), fileSystem );
return empty;
}

Expand Down