Merge branch 'master' of github.com:rcongiu/Hive-JSON-Serde

README.txt

@@ -104,6 +104,7 @@ Versions:
 1.0: initial release
 1.1: fixed some string issues
 1.1.1 (2012/07/03): fixed Map Adapter (get and put would call themselves...ooops)
+1.1.2 (2012/07/26): Fixed issue with columns that are not mapped into JSON, reported by Michael Phung
 
 
 

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>org.openx.data</groupId>
     <artifactId>json-serde</artifactId>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
     <packaging>jar</packaging>
 
     <name>openx-json-serde</name>

src/main/java/org/openx/data/jsonserde/objectinspector/JsonStructObjectInspector.java

@@ -44,7 +44,10 @@ public Object getStructFieldData(Object data, StructField fieldRef) {
         assert (fieldID >= 0 && fieldID < fields.size());
 
         try {
-            return obj.get(f.getFieldName());
+            if(obj.has(f.getFieldName()))
+               return obj.get(f.getFieldName());
+            else
+               return null;
         } catch (JSONException ex) {
             // if key does not exist
             return null;
@@ -59,7 +62,10 @@ public List<Object> getStructFieldsDataAsList(Object o) {
 
         for (int i = 0; i < fields.size(); i++) {
             try {
-                values.add(jObj.get(fields.get(i).getFieldName()));
+                if (jObj.has(fields.get(i).getFieldName()))
+                    values.add(jObj.get(fields.get(i).getFieldName()));
+                else
+                    values.add(null);
             } catch (JSONException ex) {
                 // we're iterating through the keys so 
                 // this should never happen