Merge pull request #1025 from eclipse-passage/1023

#1023 publish cli license protection facilities
eclipse-passage · Feb 12, 2022 · f2e4542 · f2e4542
2 parents 579816e + a5fbd9c
commit f2e4542
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/...pse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/LicenseProtection.java b/...pse.passage.lic.equinox/src/org/eclipse/passage/lic/equinox/access/LicenseProtection.java
@@ -18,12 +18,10 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.eclipse.passage.lic.api.LicensedProduct;
-import org.eclipse.passage.lic.api.LicensingException;
 import org.eclipse.passage.lic.api.ServiceInvocationResult;
 import org.eclipse.passage.lic.api.access.GrantLockAttempt;
 import org.eclipse.passage.lic.base.diagnostic.DiagnosticExplained;
 import org.eclipse.passage.lic.equinox.EquinoxPassage;
-import org.eclipse.passage.lic.equinox.LicensedApplication;
 
 public final class LicenseProtection {
 
@@ -71,12 +69,14 @@ private Optional<GrantLockAttempt> acquireLicense() {
 	}
 
 	private Optional<LicensedProduct> product() {
-		try {
-			return Optional.of(new LicensedApplication().product());
-		} catch (LicensingException e) {
-			log.error("Failed to read product credentials", e); //$NON-NLS-1$
-			return Optional.empty();
+		ServiceInvocationResult<LicensedProduct> product = new EquinoxPassage().product();
+		if (!product.data().isPresent()) {
+			log.error(String.format(//
+					"Failed to read product credentials:%s", //$NON-NLS-1$
+					new DiagnosticExplained(product.diagnostic()).get()));
+
 		}
+		return product.data();
 	}
 
 	private Optional<GrantLockAttempt> acquireLicense(LicensedProduct product) {