X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.api.uuid%2Fsrc%2Forg%2Fargeo%2Fapi%2Fuuid%2FConcurrentUuidFactory.java;fp=org.argeo.api.uuid%2Fsrc%2Forg%2Fargeo%2Fapi%2Fuuid%2FConcurrentUuidFactory.java;h=f2bd43689772a24c87ba5ad81e53f1f0fe00ddb4;hb=ee0a9f240a5da3a1437dda5abe7a1c46c5a3a8e9;hp=264e047063ac0872af99f1fc8b0adeba0530aaa3;hpb=73ff3654ba6d4a8381b9be5594d0d56f214fac58;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.api.uuid/src/org/argeo/api/uuid/ConcurrentUuidFactory.java b/org.argeo.api.uuid/src/org/argeo/api/uuid/ConcurrentUuidFactory.java
index 264e04706..f2bd43689 100644
--- a/org.argeo.api.uuid/src/org/argeo/api/uuid/ConcurrentUuidFactory.java
+++ b/org.argeo.api.uuid/src/org/argeo/api/uuid/ConcurrentUuidFactory.java
@@ -1,9 +1,5 @@
 package org.argeo.api.uuid;
 
-import static java.lang.System.Logger.Level.DEBUG;
-import static java.lang.System.Logger.Level.WARNING;
-
-import java.lang.System.Logger;
 import java.security.DrbgParameters;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
@@ -17,12 +13,17 @@ import java.util.UUID;
  * @see https://datatracker.ietf.org/doc/html/rfc4122
  */
 public class ConcurrentUuidFactory extends AbstractAsyncUuidFactory implements TypedUuidFactory {
-	private final static Logger logger = System.getLogger(ConcurrentUuidFactory.class.getName());
+//	private final static Logger logger = System.getLogger(ConcurrentUuidFactory.class.getName());
 
 	public ConcurrentUuidFactory(long initialClockRange, byte[] nodeId) {
 		this(initialClockRange, nodeId, 0);
 	}
 
+	/** With a random node id. */
+	public ConcurrentUuidFactory(long initialClockRange) {
+		this(initialClockRange, NodeIdSupplier.randomNodeId());
+	}
+
 	public ConcurrentUuidFactory(long initialClockRange, byte[] nodeId, int offset) {
 		Objects.requireNonNull(nodeId);
 		if (offset + 6 > nodeId.length)
@@ -67,12 +68,14 @@ public class ConcurrentUuidFactory extends AbstractAsyncUuidFactory implements T
 					DrbgParameters.instantiation(256, DrbgParameters.Capability.PR_AND_RESEED, "UUID".getBytes()));
 		} catch (NoSuchAlgorithmException e) {
 			try {
-				logger.log(DEBUG, "DRBG secure random not found, using strong");
+//				logger.log(DEBUG, "DRBG secure random not found, using strong");
 				secureRandom = SecureRandom.getInstanceStrong();
 			} catch (NoSuchAlgorithmException e1) {
-				logger.log(WARNING, "No strong secure random was found, using default");
+//				logger.log(WARNING, "No strong secure random was found, using default");
 				secureRandom = new SecureRandom();
 			}
+		} catch (java.lang.NoClassDefFoundError e) {// Android
+			secureRandom = new SecureRandom();
 		}
 		return secureRandom;
 	}