cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject git commit: fix merge
Date Mon, 07 Oct 2013 22:01:29 GMT
Updated Branches:
  refs/heads/trunk 53f7c328a -> b77fdcc3d


fix merge


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

Branch: refs/heads/trunk
Commit: b77fdcc3df540ce5f735844eec0cd4cc7909ec07
Parents: 53f7c32
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Mon Oct 7 17:00:43 2013 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Mon Oct 7 17:00:52 2013 -0500

----------------------------------------------------------------------
 .../org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java   | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b77fdcc3/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java b/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
index 0766adf..c881734 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
@@ -127,6 +127,7 @@ public abstract class AbstractCassandraStorage extends LoadFunc implements
Store
             setTupleValue(pair, 0, cassandraToObj(comparator, col.name()));
 
         // value
+        Map<ByteBuffer,AbstractType> validators = getValidatorMap(cfDef);
         if (validators.get(col.name()) == null)
         {
             Map<MarshallerType, AbstractType> marshallers = getDefaultMarshallers(cfDef);


Mime
View raw message