cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ble...@apache.org
Subject [1/2] cassandra git commit: ninja fix: for eclipse 4.5.1 compilation issue
Date Thu, 24 Nov 2016 16:53:22 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk 5af71cf69 -> af922ca6c


ninja fix: for eclipse 4.5.1 compilation issue


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5de016fd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5de016fd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5de016fd

Branch: refs/heads/trunk
Commit: 5de016fd7802fd541142fd1b5a10a82395b2bac9
Parents: 25653ba
Author: Benjamin Lerer <b.lerer@gmail.com>
Authored: Thu Nov 24 17:16:29 2016 +0100
Committer: Benjamin Lerer <b.lerer@gmail.com>
Committed: Thu Nov 24 17:16:29 2016 +0100

----------------------------------------------------------------------
 src/java/org/apache/cassandra/db/rows/AbstractRow.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5de016fd/src/java/org/apache/cassandra/db/rows/AbstractRow.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/rows/AbstractRow.java b/src/java/org/apache/cassandra/db/rows/AbstractRow.java
index f87b7c2..356722e 100644
--- a/src/java/org/apache/cassandra/db/rows/AbstractRow.java
+++ b/src/java/org/apache/cassandra/db/rows/AbstractRow.java
@@ -169,8 +169,12 @@ public abstract class AbstractRow extends AbstractCollection<ColumnData>
impleme
                                                  ut.fieldType(fId).getString(cell.value()));
                         };
                     }
+                    else
+                    {
+                        transform = cell -> "";
+                    }
                     sb.append(StreamSupport.stream(complexData.spliterator(), false)
-                                           .map(transform != null ? transform : cell ->
"")
+                                           .map(transform)
                                            .collect(Collectors.joining(", ", "{", "}")));
                 }
             }


Mime
View raw message