From e5e5597efc96edae7b3e6151850b707f3e29a1cc Mon Sep 17 00:00:00 2001
From: Roy Wetherall <rwetherall@gmail.com>
Date: Mon, 29 Feb 2016 13:52:17 +1100
Subject: [PATCH] Fixed issues with detecting correct license

---
 .../bootstrap/ModuleCompatibilityComponent.java        | 10 +++++++++-
 .../ModuleCompatibilityComponentUnitTest.java          |  8 ++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/ModuleCompatibilityComponent.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/ModuleCompatibilityComponent.java
index 4833a1b282..95fb4e8082 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/ModuleCompatibilityComponent.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/ModuleCompatibilityComponent.java
@@ -21,6 +21,7 @@ package org.alfresco.module.org_alfresco_module_rm.bootstrap;
 import org.alfresco.service.cmr.admin.RepoUsage.LicenseMode;
 import org.alfresco.service.cmr.module.ModuleService;
 import org.alfresco.service.descriptor.DescriptorService;
+import org.alfresco.service.license.LicenseDescriptor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.context.ApplicationContext;
@@ -73,11 +74,18 @@ public class ModuleCompatibilityComponent implements ApplicationListener<Context
 	@Override
 	public void onApplicationEvent(ContextRefreshedEvent contextRefreshedEvent) 
 	{
+		// license mode
+		LicenseMode licenseMode = LicenseMode.UNKNOWN;
+		
 		// grab the application context
 		ApplicationContext applicationContext = contextRefreshedEvent.getApplicationContext();
 		
 		// get the license mode
-		LicenseMode licenseMode = descriptorService.getServerDescriptor().getLicenseMode();
+		LicenseDescriptor license = descriptorService.getLicenseDescriptor();
+		if (license != null)
+		{
+			licenseMode = license.getLicenseMode();
+		}
 		
 		// determine whether RM Enterprise is installed or not
 		boolean isRMEnterprise = isRMEnterprise();
diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/ModuleCompatibilityComponentUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/ModuleCompatibilityComponentUnitTest.java
index 1e01b83837..e4c7eef75c 100644
--- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/ModuleCompatibilityComponentUnitTest.java
+++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/ModuleCompatibilityComponentUnitTest.java
@@ -26,8 +26,8 @@ import static org.mockito.Mockito.when;
 import org.alfresco.service.cmr.admin.RepoUsage.LicenseMode;
 import org.alfresco.service.cmr.module.ModuleDetails;
 import org.alfresco.service.cmr.module.ModuleService;
-import org.alfresco.service.descriptor.Descriptor;
 import org.alfresco.service.descriptor.DescriptorService;
+import org.alfresco.service.license.LicenseDescriptor;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.InjectMocks;
@@ -50,7 +50,7 @@ public class ModuleCompatibilityComponentUnitTest
 	@Mock private ContextRefreshedEvent mockedContextRefreshedEvent;
 	@Mock private ConfigurableApplicationContext mockedApplicationContext;
 	@Mock private ModuleDetails mockedModuleDetails;
-	@Mock private Descriptor mockedDescriptor;
+	@Mock private LicenseDescriptor mockedDescriptor;
 	
 	/** object under test */
 	@InjectMocks private ModuleCompatibilityComponent moduleCompatibilityComponent;
@@ -65,8 +65,8 @@ public class ModuleCompatibilityComponentUnitTest
 		
 		when(mockedContextRefreshedEvent.getApplicationContext())
 			.thenReturn(mockedApplicationContext);
-		when(mockedDescriptorService.getServerDescriptor())
-			.thenReturn(mockedDescriptor);
+		when(mockedDescriptorService.getLicenseDescriptor())
+			.thenReturn(mockedDescriptor);		
 	}
 	
 	/**