svn commit: r1332808 - in /incubator/hcatalog/branches/branch-0.4: ./ src/java/org/apache/hcatalog/data/HCatRecordSerDe.java src/java/org/apache/hcatalog/data/JsonSerDe.java

[toffer]

Author: toffer
Date: Tue May  1 20:41:37 2012
New Revision: 1332808

URL: http://svn.apache.org/viewvc?rev=1332808&view=rev
Log:
merged from trunk: HCATALOG-68 correct addendum to patch missed some changes in 
comments (avandana via toffer)

Modified:
    incubator/hcatalog/branches/branch-0.4/   (props changed)
    
incubator/hcatalog/branches/branch-0.4/src/java/org/apache/hcatalog/data/HCatRecordSerDe.java
    
incubator/hcatalog/branches/branch-0.4/src/java/org/apache/hcatalog/data/JsonSerDe.java

Propchange: incubator/hcatalog/branches/branch-0.4/
------------------------------------------------------------------------------
  Merged /incubator/hcatalog/trunk:r1332807

Modified: 
incubator/hcatalog/branches/branch-0.4/src/java/org/apache/hcatalog/data/HCatRecordSerDe.java
URL: 
http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.4/src/java/org/apache/hcatalog/data/HCatRecordSerDe.java?rev=1332808&r1=1332807&r2=1332808&view=diff
==============================================================================
--- 
incubator/hcatalog/branches/branch-0.4/src/java/org/apache/hcatalog/data/HCatRecordSerDe.java
 (original)
+++ 
incubator/hcatalog/branches/branch-0.4/src/java/org/apache/hcatalog/data/HCatRecordSerDe.java
 Tue May  1 20:41:37 2012
@@ -87,8 +87,8 @@ public class HCatRecordSerDe implements 
     }
 
 
-    LOG.debug("columns: {}",columnNameProperty,columnNames);
-    LOG.debug("types: {}", columnTypeProperty, columnTypes);
+    LOG.debug("columns: {} {}",columnNameProperty,columnNames);
+    LOG.debug("types: {} {}", columnTypeProperty, columnTypes);
     assert (columnNames.size() == columnTypes.size());
 
     rowTypeInfo = (StructTypeInfo) 
TypeInfoFactory.getStructTypeInfo(columnNames, columnTypes);

Modified: 
incubator/hcatalog/branches/branch-0.4/src/java/org/apache/hcatalog/data/JsonSerDe.java
URL: 
http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.4/src/java/org/apache/hcatalog/data/JsonSerDe.java?rev=1332808&r1=1332807&r2=1332808&view=diff
==============================================================================
--- 
incubator/hcatalog/branches/branch-0.4/src/java/org/apache/hcatalog/data/JsonSerDe.java
 (original)
+++ 
incubator/hcatalog/branches/branch-0.4/src/java/org/apache/hcatalog/data/JsonSerDe.java
 Tue May  1 20:41:37 2012
@@ -150,10 +150,12 @@ public class JsonSerDe implements SerDe 
         populateRecord(r,token,p,schema);
       }
     } catch (JsonParseException e) {
-        LOG.warn("Error [{}] parsing json location [{}].", e.getMessage(), 
e.getLocation());
+      LOG.warn("Error [{}] parsing json text [{}].", e, t);
+      LOG.debug(null,e);
       throw new SerDeException(e);
     } catch (IOException e) {
-        LOG.warn("Error [{}] parsing json text [{}].", e.getMessage(),t);
+      LOG.warn("Error [{}] parsing json text [{}].", e, t);
+      LOG.debug(null,e);
       throw new SerDeException(e);
     }