Merge pull request #1075 from virtualsatellite/feature/task_1074-VirS…

…at_UUID_fix Fixing repeated conversion between UUID and String
virtualsatellite · Mar 31, 2022 · d037df1 · d037df1
2 parents 690bec2 + 5f346d4
commit d037df1
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/de.dlr.sc.virsat.model/src/de/dlr/sc/virsat/model/dvlm/types/impl/VirSatUuid.java b/de.dlr.sc.virsat.model/src/de/dlr/sc/virsat/model/dvlm/types/impl/VirSatUuid.java
@@ -21,13 +21,13 @@
 public class VirSatUuid {
 
 	public static final String UUID_NA = "VIRSAT-UUID-NO-UUID-YET-SET";
-	private UUID uuid;
+	private final String uuid;
 
 	/**
 	 * COnstructor generating a random UUID
 	 */
 	public VirSatUuid() {
-		this.uuid = UUID.randomUUID();
+		this.uuid = UUID.randomUUID().toString();
 	}
 
 	/**
@@ -36,9 +36,9 @@ public VirSatUuid() {
 	 */
 	public VirSatUuid(String uuidString) {
 		if ((uuidString != null) && (!uuidString.isEmpty())) {
-			this.uuid = UUID.fromString(uuidString);
+			this.uuid = uuidString;
 		} else {
-			uuid = UUID.randomUUID();
+			uuid = UUID.randomUUID().toString();
 		}
 	}