From 400d432f8f8fe8a263930718c1c82a3b4333b606 Mon Sep 17 00:00:00 2001 From: Paul Smelser Date: Tue, 27 Feb 2018 13:53:06 -0500 Subject: [PATCH 1/2] adding release notes --- release-notes.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/release-notes.md b/release-notes.md index dd43ee0..2294bd6 100644 --- a/release-notes.md +++ b/release-notes.md @@ -26,6 +26,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 From c6ef7e6b02f7f9844cb98bc72e6b1fa0e254f478 Mon Sep 17 00:00:00 2001 From: Paul Smelser Date: Wed, 28 Feb 2018 14:24:23 -0500 Subject: [PATCH 2/2] fixing bug in PartnerCenterAdminConnection. serviceProvider was being used before it was set./ --- release-notes.md | 5 +++++ .../connect/admin/PartnerCenterAdminConnection.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/release-notes.md b/release-notes.md index 2294bd6..dd64a55 100644 --- 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 diff --git a/src/main/java/org/springframework/social/partnercenter/connect/admin/PartnerCenterAdminConnection.java b/src/main/java/org/springframework/social/partnercenter/connect/admin/PartnerCenterAdminConnection.java index 311743e..a4e51b6 100644 --- a/src/main/java/org/springframework/social/partnercenter/connect/admin/PartnerCenterAdminConnection.java +++ b/src/main/java/org/springframework/social/partnercenter/connect/admin/PartnerCenterAdminConnection.java @@ -36,11 +36,11 @@ public class PartnerCenterAdminConnection extends AbstractConnection 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(); }