This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.discovery.base-2.0.4 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-base.git
commit dafae9981459751b93253e268cc5ecf1695a8d0a Author: Stefan Egli <[email protected]> AuthorDate: Mon Jul 3 14:47:14 2017 +0000 SLING-6993 : johnzon regression : apparently jsonobj.getString internally did a toString in commons.json, not in commons.johnzon it seems. fixing by doing get().toString() instead git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/base@1800683 13f79535-47bb-0310-9956-ffa450edef68 --- .../sling/discovery/base/connectors/announcement/Announcement.java | 3 ++- .../discovery/base/connectors/ping/TopologyRequestValidator.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/apache/sling/discovery/base/connectors/announcement/Announcement.java b/src/main/java/org/apache/sling/discovery/base/connectors/announcement/Announcement.java index c9de955..344a718 100644 --- a/src/main/java/org/apache/sling/discovery/base/connectors/announcement/Announcement.java +++ b/src/main/java/org/apache/sling/discovery/base/connectors/announcement/Announcement.java @@ -35,6 +35,7 @@ import javax.json.JsonObject; import javax.json.JsonObjectBuilder; import javax.json.JsonReaderFactory; import javax.json.JsonValue; +import javax.json.JsonValue.ValueType; import org.apache.sling.api.resource.ModifiableValueMap; import org.apache.sling.api.resource.PersistenceException; @@ -324,7 +325,7 @@ public class Announcement { .getJsonArray("topologyAnnouncements"); for (int i = 0; i < subAnnouncements.size(); i++) { - String subAnnouncementJSON = subAnnouncements.getString(i); + String subAnnouncementJSON = subAnnouncements.get(i).toString(); result.addIncomingTopologyAnnouncement(fromJSON(subAnnouncementJSON)); } return result; diff --git a/src/main/java/org/apache/sling/discovery/base/connectors/ping/TopologyRequestValidator.java b/src/main/java/org/apache/sling/discovery/base/connectors/ping/TopologyRequestValidator.java index 833e995..fa70321 100644 --- a/src/main/java/org/apache/sling/discovery/base/connectors/ping/TopologyRequestValidator.java +++ b/src/main/java/org/apache/sling/discovery/base/connectors/ping/TopologyRequestValidator.java @@ -434,8 +434,8 @@ public class TopologyRequestValidator { BadPaddingException, UnsupportedEncodingException, InvalidKeyException, NoSuchAlgorithmException, NoSuchPaddingException, InvalidAlgorithmParameterException, InvalidKeySpecException { Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding"); - cipher.init(Cipher.DECRYPT_MODE, getCiperKey(Base64.decodeBase64(jsonArray.getString(0).getBytes("UTF-8"))), new IvParameterSpec(Base64.decodeBase64(jsonArray.getString(1).getBytes("UTF-8")))); - return new String(cipher.doFinal(Base64.decodeBase64(jsonArray.getString(2).getBytes("UTF-8")))); + cipher.init(Cipher.DECRYPT_MODE, getCiperKey(Base64.decodeBase64(jsonArray.get(0).toString().getBytes("UTF-8"))), new IvParameterSpec(Base64.decodeBase64(jsonArray.get(1).toString().getBytes("UTF-8")))); + return new String(cipher.doFinal(Base64.decodeBase64(jsonArray.get(2).toString().getBytes("UTF-8")))); } /** -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
