Merge pull request #160 from paulsmelser/release/fixing_error_in_admi…

…n_connection Release Fixing error in admin connection
SpringSocialMicrosoft · Feb 28, 2018 · 4aa2979 · 4aa2979
2 parents 5f1bdf7 + c6ef7e6
commit 4aa2979
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/release-notes.md b/release-notes.md
@@ -1,5 +1,10 @@
 # Release Notes: Spring Social for Microsoft Partner Center
 
+## 6.2.3
+
+#### Bug Fixes
+1. Fixed failure in PartnerCenterAdminConnection constructor `PartnerCenterAdminConnection(ConnectionData, ApiAdaptor, ServiceProvider)`.
+
 ## 6.2.2
 
 #### Bug Fixes
@@ -26,6 +31,11 @@ on `org.springframework.social.partnercenter.api.PartnerCenterTemplate` and `org
 1. Fixed logging issue where multiple redundant loggers were added when logging was enabled through `enableSlf4j(LogLevel level)` 
 on `org.springframework.social.partnercenter.api.PartnerCenterTemplate` and `org.springframework.social.partnercenter.security.AzureADAuthTemplate`
 
+## 5.1.1 (Merge back fixes in 6.2.2) 
+
+#### Bug Fixes
+1. Fixed Conversion Result message contract. The properties from ConversionError and ConversionResult were swapped
+
 ## 4.0.17
 
 #### Bug Fixes

diff --git a/.../org/springframework/social/partnercenter/connect/admin/PartnerCenterAdminConnection.java b/.../org/springframework/social/partnercenter/connect/admin/PartnerCenterAdminConnection.java
@@ -36,11 +36,11 @@ public class PartnerCenterAdminConnection extends AbstractConnection<PartnerCent
 	 */
 	public PartnerCenterAdminConnection(ConnectionData data, ApiAdapter<PartnerCenter> apiAdapter, PartnerCenterServiceProvider serviceProvider) {
 		super(data, apiAdapter);
+		this.serviceProvider = serviceProvider;
 		initAccessAttributes(data.getAccessToken(), data.getExpireTime(), data.getRefreshToken());
 		initApi();
 		initApiProxy();
 		initKey(data.getProviderId(), data.getProviderUserId());
-		this.serviceProvider = serviceProvider;
 		if (this.hasExpired()) {
 			refresh();
 		}