svn commit: r1592822 - /commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVRecord.java

[br...@apache.org]

Author: britter
Date: Tue May  6 18:11:37 2014
New Revision: 1592822

URL: http://svn.apache.org/r1592822
Log:
CSV-115: Simplify boolean expressions in CSVRecord. This also closes #1 from github. Thanks to Furkan Kamaci.

Modified:
    commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVRecord.java

Modified: commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVRecord.java
URL: http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVRecord.java?rev=1592822&r1=1592821&r2=1592822&view=diff
==============================================================================
--- commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVRecord.java (original)
+++ commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVRecord.java Tue May  6 18:11:37 2014
@@ -136,7 +136,7 @@ public final class CSVRecord implements 
      * @return true of this record is valid, false if not
      */
     public boolean isConsistent() {
-        return mapping == null ? true : mapping.size() == values.length;
+        return mapping == null || mapping.size() == values.length;
     }
 
     /**
@@ -147,7 +147,7 @@ public final class CSVRecord implements 
      * @return whether a given column is mapped.
      */
     public boolean isMapped(final String name) {
-        return mapping != null ? mapping.containsKey(name) : false;
+        return mapping != null && mapping.containsKey(name);
     }
 
     /**