You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by du...@apache.org on 2017/09/08 09:07:34 UTC
svn commit: r1807694 - in
/sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/osgi:
BundlesInfo.java ComponentsInfo.java
Author: dulvac
Date: Fri Sep 8 09:07:34 2017
New Revision: 1807694
URL: http://svn.apache.org/viewvc?rev=1807694&view=rev
Log:
SLING-7116 [http.testing.clients] o.a.s.testing.clients.osgi.ComponentsInfo.findBy() does not honor the value parameter
Modified:
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/osgi/BundlesInfo.java
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/osgi/ComponentsInfo.java
Modified: sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/osgi/BundlesInfo.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/osgi/BundlesInfo.java?rev=1807694&r1=1807693&r2=1807694&view=diff
==============================================================================
--- sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/osgi/BundlesInfo.java (original)
+++ sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/osgi/BundlesInfo.java Fri Sep 8 09:07:34 2017
@@ -129,12 +129,10 @@ public class BundlesInfo {
Iterator<JsonNode> nodes = root.get("data").getElements();
while(nodes.hasNext()) {
JsonNode node = nodes.next();
- if(node.get(key) != null) {
- if(node.get(key).isValueNode()) {
- String valueNode=node.get(key).getTextValue();
- if (valueNode.equals(value)){
- return node;
- }
+ if ((null != node.get(key)) && (node.get(key).isValueNode())) {
+ final String valueNode = node.get(key).getTextValue();
+ if (valueNode.equals(value)) {
+ return node;
}
}
}
Modified: sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/osgi/ComponentsInfo.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/osgi/ComponentsInfo.java?rev=1807694&r1=1807693&r2=1807694&view=diff
==============================================================================
--- sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/osgi/ComponentsInfo.java (original)
+++ sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/osgi/ComponentsInfo.java Fri Sep 8 09:07:34 2017
@@ -83,13 +83,13 @@ public class ComponentsInfo {
Iterator<JsonNode> nodes = root.get("data").getElements();
while(nodes.hasNext()) {
JsonNode node = nodes.next();
- if(node.get(key) != null) {
- if(node.get(key).isValueNode()) {
+ if ((null != node.get(key)) && (node.get(key).isValueNode())) {
+ final String valueNode = node.get(key).getTextValue();
+ if (valueNode.equals(value)) {
return node;
}
}
}
return null;
}
-
}
\ No newline at end of file