Skip to content
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

fix: file io bug #119

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix: file io bug #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a76cb33
fix: file io bug
Jan 13, 2022
6739b3c
fix: file io bug
glowwormX Jan 13, 2022
7f8b0d5
feat: FileExtraFromFileHashResponse add getTransaction()
Jan 14, 2022
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
13 changes: 13 additions & 0 deletions src/main/java/cn/hyperchain/sdk/response/filemgr/FileExtraFromFileHashResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,19 @@ public FileExtra getFileExtra() {
return FileExtra.fromJson(extra);
}

/**
* parse transaction from result.
*
* @return transaction
*/
public TxResponse.Transaction getTransaction() {
List<TxResponse.Transaction> transactions = result.parseResult(TxResponse.Transaction.class);
if (transactions.size() == 0) {
throw new RuntimeException("can't get any transaction");
}
return transactions.get(0);
}

@Override
public String toString() {
return "FileExtraFromFileHashResponse{" +
Expand Down
55 changes: 29 additions & 26 deletions src/main/java/cn/hyperchain/sdk/service/impl/FileMgrServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,14 @@ public FileUploadResponse fileUpload(String filePath, String description, Accoun
fileUploadResponse = (FileUploadResponse) fileTransferRequest.send();
} catch (RequestException e) {
throw new FileMgrException("File upload failed" + e.getMsg());
} finally {
try {
randomAccessFile.close();
} catch (IOException e) {
logger.warn("close randomAccessFile failed");
}
}
try {
randomAccessFile.close();
} catch (IOException e) {
logger.warn("close randomAccessFile failed");
}

fileUploadResponse.setTranRequest(fileTransferRequest);
fileUploadResponse.setFileHash(fileHash);
fileUploadResponse.setProviderManager(providerManager);
Expand Down Expand Up @@ -191,11 +193,12 @@ public FileUploadResponse fileUpload(FileUploadParams fileParams,int nodeId) thr
fileUploadResponse = (FileUploadResponse) fileTransferRequest.send();
} catch (RequestException e) {
throw new FileMgrException("File upload failed" + e.getMsg());
}
try {
randomAccessFile.close();
} catch (IOException e) {
logger.warn("close randomAccessFile failed");
} finally {
try {
randomAccessFile.close();
} catch (IOException e) {
logger.warn("close randomAccessFile failed");
}
}
fileUploadResponse.setTranRequest(fileTransferRequest);
fileUploadResponse.setFileHash(fileHash);
Expand Down Expand Up @@ -319,22 +322,22 @@ public FileDownloadResponse fileDownload(String filePath, String fileHash, Strin
}
}
return new FileDownloadResponse(e.getCode(), e.getMsg());
}

try {
fileLock.release();
} catch (IOException e) {
logger.warn("release fileLock failed");
}
try {
channel.close();
} catch (IOException e) {
logger.warn("close file channel failed");
}
try {
randomAccessFile.close();
} catch (IOException e) {
logger.warn("close randomAccessFile failed");
} finally {
try {
fileLock.release();
} catch (IOException e) {
logger.warn("release fileLock failed");
}
try {
channel.close();
} catch (IOException e) {
logger.warn("close file channel failed");
}
try {
randomAccessFile.close();
} catch (IOException e) {
logger.warn("close randomAccessFile failed");
}
}
return fileDownloadResponse;
}
Expand Down