safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-462: Merge null-check fix for UUIDs.

Browse Source
This commit is contained in:
James Muehlner
2022-03-31 13:14:01 -07:00
committed by GitHub
parent 54dc3d2b46 98abadaef5
commit 5f49d89166
1 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
extensions/guacamole-history-recording-storage/src/main/java/org/apache/guacamole/history/connection/HistoryConnectionRecord.java
View File

@@ -71,6 +71,35 @@ public class HistoryConnectionRecord extends DelegatingConnectionRecord {
*/
private final File recording;
/**
* Returns the file or directory providing recording storage for the given
* history record. If no such file or directory exists, or the file cannot
* be read, null is returned.
*
* @param record
* The ConnectionRecord whose associated recording storage file
* or directory should be returned.
*
* @return
* A File pointing to the file or directory providing recording storage
* for the given history record, or null if no such file exists.
*
* @throws GuacamoleException
* If the configured path for stored recordings cannot be read.
*/
private static File getRecordingFile(ConnectionRecord record) throws GuacamoleException {
UUID uuid = record.getUUID();
if (uuid != null) {
File recordingFile = new File(HistoryAuthenticationProvider.getRecordingSearchPath(), uuid.toString());
if (recordingFile.canRead())
return recordingFile;
}
return null;
}
/**
* Creates a new HistoryConnectionRecord that wraps the given
* ConnectionRecord, automatically associating ActivityLogs based on
@@ -84,11 +113,7 @@ public class HistoryConnectionRecord extends DelegatingConnectionRecord {
*/
public HistoryConnectionRecord(ConnectionRecord record) throws GuacamoleException {
super(record);
String uuid = record.getUUID().toString();
File recordingFile = new File(HistoryAuthenticationProvider.getRecordingSearchPath(), uuid);
this.recording = recordingFile.canRead() ? recordingFile : null;
this.recording = getRecordingFile(record);
}
/**