GitLab Mirror pushed to branch trunk at cms-community / hippo-jackrabbit
Commits: 6403e845 by David Brosius at 2017-03-05T23:34:08+00:00 once the property is found, break out of the loop git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1785579 13f79535-47bb-0310-9956-ffa450edef68 - - - - - eb06f286 by David Brosius at 2017-03-05T23:38:30+00:00 use short-circuiting conditionals (&& vs &) git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1785580 13f79535-47bb-0310-9956-ffa450edef68 - - - - - 2 changed files: - jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java - jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryFactory.java Changes: ===================================== jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java ===================================== --- a/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java +++ b/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java @@ -97,7 +97,7 @@ public final class Utils { String region = prop.getProperty(S3Constants.S3_REGION); String endpoint = null; String propEndPoint = prop.getProperty(S3Constants.S3_END_POINT); - if ((propEndPoint != null) & !"".equals(propEndPoint)) { + if ((propEndPoint != null) && !"".equals(propEndPoint)) { endpoint = propEndPoint; } else { if (StringUtils.isNullOrEmpty(region)) { ===================================== jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryFactory.java ===================================== --- a/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryFactory.java +++ b/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryFactory.java @@ -616,6 +616,7 @@ public class LuceneQueryFactory { for (PropertyDefinition pd : nt.getPropertyDefinitions()) { if (pd.getName().equals(pv.getPropertyName())) { type = pd.getRequiredType(); + break; } } } View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/compare/3389dc59145933fa743cb8ca210475805e8e4992...eb06f286b1eaad22cc5210035f983e249ac7ff4f
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
