Merge remote-tracking branch 'upstream/3.3' into 3.4

neo4j · Apr 17, 2018 · 606b2ec · 606b2ec
2 parents d3e9eaf + 5f969d7
commit 606b2ec
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/community/csv/src/main/java/org/neo4j/csv/reader/BufferedCharSeeker.java b/community/csv/src/main/java/org/neo4j/csv/reader/BufferedCharSeeker.java
@@ -224,16 +224,16 @@ private int rtrim()
 
     private boolean isWhitespace( int ch )
     {
-        return ch == ' ' |
-                ch == Character.SPACE_SEPARATOR |
-                ch == Character.PARAGRAPH_SEPARATOR |
-                ch == '\u00A0' |
-                ch == '\u001C' |
-                ch == '\u001D' |
-                ch == '\u001E' |
-                ch == '\u001F' |
-                ch == '\u2007' |
-                ch == '\u202F' |
+        return ch == ' ' ||
+                ch == Character.SPACE_SEPARATOR ||
+                ch == Character.PARAGRAPH_SEPARATOR ||
+                ch == '\u00A0' ||
+                ch == '\u001C' ||
+                ch == '\u001D' ||
+                ch == '\u001E' ||
+                ch == '\u001F' ||
+                ch == '\u2007' ||
+                ch == '\u202F' ||
                 ch == '\t';
 
     }