From 136dd679c425269dfd2d105f1a3c55998ba5b3df Mon Sep 17 00:00:00 2001
From: Andrew Gaul <andrew@gaul.org>
Date: Sun, 31 Aug 2014 13:59:45 -0700
Subject: [PATCH] Enforce consistent operator wrapping style

---
 src/main/java/org/gaul/s3proxy/S3Proxy.java        | 6 +++---
 src/main/java/org/gaul/s3proxy/S3ProxyHandler.java | 4 ++--
 src/main/resources/checkstyle.xml                  | 3 +++
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/gaul/s3proxy/S3Proxy.java b/src/main/java/org/gaul/s3proxy/S3Proxy.java
index 694cce1..99e7f2b 100644
--- a/src/main/java/org/gaul/s3proxy/S3Proxy.java
+++ b/src/main/java/org/gaul/s3proxy/S3Proxy.java
@@ -110,9 +110,9 @@ public final class S3Proxy {
                 S3ProxyConstants.PROPERTY_ENDPOINT);
         String s3ProxyAuthorization = properties.getProperty(
                 S3ProxyConstants.PROPERTY_AUTHORIZATION);
-        if (provider == null || identity == null || credential == null
-                || s3ProxyEndpointString == null
-                || s3ProxyAuthorization == null) {
+        if (provider == null || identity == null || credential == null ||
+                s3ProxyEndpointString == null ||
+                s3ProxyAuthorization == null) {
             System.err.println("Properties file must contain:\n" +
                     Constants.PROPERTY_PROVIDER + "\n" +
                     Constants.PROPERTY_IDENTITY + "\n" +
diff --git a/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java b/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
index 0af003a..4828a17 100644
--- a/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
+++ b/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
@@ -650,9 +650,9 @@ final class S3ProxyHandler extends AbstractHandler {
         int status = HttpServletResponse.SC_OK;
         GetOptions options = new GetOptions();
         String range = request.getHeader(HttpHeaders.RANGE);
-        if (range != null && range.startsWith("bytes=")
+        if (range != null && range.startsWith("bytes=") &&
                 // ignore multiple ranges
-                && range.indexOf(',') == -1) {
+                range.indexOf(',') == -1) {
             range = range.substring("bytes=".length());
             String[] ranges = range.split("-", 2);
             if (ranges[0].isEmpty()) {
diff --git a/src/main/resources/checkstyle.xml b/src/main/resources/checkstyle.xml
index 8a26267..873d495 100644
--- a/src/main/resources/checkstyle.xml
+++ b/src/main/resources/checkstyle.xml
@@ -63,6 +63,9 @@
     <module name="NoWhitespaceAfter"/>
     <module name="NoWhitespaceBefore"/>
     <module name="OneStatementPerLine"/>
+    <module name="OperatorWrap">
+      <property name="option" value="eol"/>
+    </module>
     <module name="PackageName"/>
     <module name="ParameterName"/>
     <module name="ParenPad"/>