Repository: gora Updated Branches: refs/heads/master 3977e99b1 -> 8fad49d71
GORA-463 Missing assignment in CassandraSubColumn#getUnionSchema() Project: http://git-wip-us.apache.org/repos/asf/gora/repo Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/e0009e6d Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/e0009e6d Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/e0009e6d Branch: refs/heads/master Commit: e0009e6d6e42d2b2462f28bcff83648f2a1b77a5 Parents: 4f98503 Author: Lewis John McGibbney <[email protected]> Authored: Sun Feb 28 12:51:17 2016 -0800 Committer: Lewis John McGibbney <[email protected]> Committed: Sun Feb 28 12:51:17 2016 -0800 ---------------------------------------------------------------------- .../org/apache/gora/cassandra/query/CassandraSubColumn.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/gora/blob/e0009e6d/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraSubColumn.java ---------------------------------------------------------------------- diff --git a/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraSubColumn.java b/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraSubColumn.java index 72cd0dd..70acfe2 100644 --- a/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraSubColumn.java +++ b/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraSubColumn.java @@ -95,8 +95,9 @@ public class CassandraSubColumn extends CassandraColumn { private Schema getUnionSchema (int pSchemaPos, Schema pSchema){ Schema unionSchema = pSchema.getTypes().get(pSchemaPos); // default union element - if ( unionSchema == null ) - pSchema.getTypes().get(CassandraStore.DEFAULT_UNION_SCHEMA); + if ( unionSchema == null ) { + unionSchema = pSchema.getTypes().get(CassandraStore.DEFAULT_UNION_SCHEMA); + } return unionSchema; }
