svn commit: r1800683 - in /sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/connectors: announcement/Announcement.java ping/TopologyRequestValidator.java

[stefanegli]

Author: stefanegli
Date: Mon Jul  3 14:47:14 2017
New Revision: 1800683

URL: http://svn.apache.org/viewvc?rev=1800683&view=rev
Log:
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

Modified:
    
sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/connectors/announcement/Announcement.java
    
sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/connectors/ping/TopologyRequestValidator.java

Modified: 
sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/connectors/announcement/Announcement.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/connectors/announcement/Announcement.java?rev=1800683&r1=1800682&r2=1800683&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/connectors/announcement/Announcement.java
 (original)
+++ 
sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/connectors/announcement/Announcement.java
 Mon Jul  3 14:47:14 2017
@@ -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;

Modified: 
sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/connectors/ping/TopologyRequestValidator.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/connectors/ping/TopologyRequestValidator.java?rev=1800683&r1=1800682&r2=1800683&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/connectors/ping/TopologyRequestValidator.java
 (original)
+++ 
sling/trunk/bundles/extensions/discovery/base/src/main/java/org/apache/sling/discovery/base/connectors/ping/TopologyRequestValidator.java
 Mon Jul  3 14:47:14 2017
@@ -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"))));
     }
 
     /**