svn commit: r1390922 - in /camel/trunk/components/camel-hbase/src: main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java test/java/org/apache/camel/component/hbase/HBaseProducerTest.java

[iocanel]

Author: iocanel
Date: Thu Sep 27 10:11:51 2012
New Revision: 1390922

URL: http://svn.apache.org/viewvc?rev=1390922&view=rev
Log:
[CAMEL-5653] camel-hbase header mapping strategy will skip null 
family/qualifier pairs.

Modified:
    
camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java
    
camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java

Modified: 
camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java?rev=1390922&r1=1390921&r2=1390922&view=diff
==============================================================================
--- 
camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java
 (original)
+++ 
camel/trunk/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/mapping/HeaderMappingStrategy.java
 Thu Sep 27 10:11:51 2012
@@ -64,12 +64,14 @@ public class HeaderMappingStrategy imple
 
             hRow.setId(id);
             hRow.setRowType(rowClass);
-            hCell.setQualifier(columnName);
-            hCell.setFamily(columnFamily);
-            hCell.setValue(value);
-            // String is the default value type
-            hCell.setValueType((valueClass != null) ? valueClass : 
String.class);
-            hRow.getCells().add(hCell);
+            if (columnFamily != null && columnName != null) {
+                hCell.setQualifier(columnName);
+                hCell.setFamily(columnFamily);
+                hCell.setValue(value);
+                // String is the default value type
+                hCell.setValueType((valueClass != null) ? valueClass : 
String.class);
+                hRow.getCells().add(hCell);
+            }
         }
         return hRow;
     }

Modified: 
camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java?rev=1390922&r1=1390921&r2=1390922&view=diff
==============================================================================
--- 
camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
 (original)
+++ 
camel/trunk/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
 Thu Sep 27 10:11:51 2012
@@ -121,8 +121,6 @@ public class HBaseProducerTest extends C
 
             Exchange getExchange = 
startWithModelEndpoint.createExchange(ExchangePattern.InOut);
             
getExchange.getIn().setHeader(HbaseAttribute.HBASE_ROW_ID.asHeader(), key[0]);
-            
getExchange.getIn().setHeader(HbaseAttribute.HBASE_FAMILY.asHeader(), 
family[0]);
-            
getExchange.getIn().setHeader(HbaseAttribute.HBASE_QUALIFIER.asHeader(), 
column[0][0]);
             getExchange.getIn().setHeader(HBaseConstants.OPERATION, 
HBaseConstants.GET);
             Exchange resp = template.send(startWithModelEndpoint, getExchange);