--- metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java (revision 1022971) +++ metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java (working copy) @@ -517,7 +517,11 @@ if (sd.getBucketCols().size() > 0) { schema.setProperty(org.apache.hadoop.hive.metastore.api.Constants.BUCKET_FIELD_NAME, sd.getBucketCols().get(0)); } - schema.putAll(sd.getSerdeInfo().getParameters()); + + for (Map.Entry param : sd.getSerdeInfo().getParameters().entrySet()) { + schema.put(param.getKey(), (param.getValue() != null) ? param.getValue() : ""); + } + if(sd.getSerdeInfo().getSerializationLib() != null) { schema.setProperty(org.apache.hadoop.hive.serde.Constants.SERIALIZATION_LIB, sd.getSerdeInfo().getSerializationLib()); }