--- metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java (revision 1032602) +++ metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java (working copy) @@ -504,7 +504,10 @@ .getBucketCols().get(0)); } if (sd.getSerdeInfo() != null) { - 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