PIG-4975 Map schema shows "Type: null Uid: null" in explain (knoguchi)


git-svn-id: https://svn.apache.org/repos/asf/pig/trunk@1758812 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 97e714f..69728d7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -40,6 +40,8 @@
  
 BUG FIXES
 
+PIG-4975 Map schema shows "Type: null Uid: null" in explain (knoguchi)
+
 PIG-4973: Bigdecimal divison fails (szita via daijy)
 
 PIG-4967: NPE in PigJobControl.run() when job status is null (water via daijy)
diff --git a/src/org/apache/pig/newplan/logical/expression/MapLookupExpression.java b/src/org/apache/pig/newplan/logical/expression/MapLookupExpression.java
index bbce80e..3df7af6 100644
--- a/src/org/apache/pig/newplan/logical/expression/MapLookupExpression.java
+++ b/src/org/apache/pig/newplan/logical/expression/MapLookupExpression.java
@@ -95,7 +95,8 @@
         LogicalFieldSchema predFS = successor.getFieldSchema();
         if (predFS!=null) {
             if (predFS.type==DataType.MAP && predFS.schema!=null) {
-                return (predFS.schema.getField(0));
+                fieldSchema = predFS.schema.getField(0);
+                return fieldSchema;
             }
             else {
                 fieldSchema = new LogicalSchema.LogicalFieldSchema(null, null, DataType.BYTEARRAY);