You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by db...@apache.org on 2017/03/05 23:38:30 UTC

svn commit: r1785580 - /jackrabbit/trunk/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java

Author: dbrosius
Date: Sun Mar  5 23:38:30 2017
New Revision: 1785580

URL: http://svn.apache.org/viewvc?rev=1785580&view=rev
Log:
use short-circuiting conditionals (&& vs &)

Modified:
    jackrabbit/trunk/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java

Modified: jackrabbit/trunk/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java?rev=1785580&r1=1785579&r2=1785580&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java (original)
+++ jackrabbit/trunk/jackrabbit-aws-ext/src/main/java/org/apache/jackrabbit/aws/ext/Utils.java Sun Mar  5 23:38:30 2017
@@ -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)) {