svn commit: r1624022 - /jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/thrift/ThriftConvert.java

[rvesse]

Author: rvesse
Date: Wed Sep 10 15:10:15 2014
New Revision: 1624022

URL: http://svn.apache.org/r1624022
Log:
Improve ThriftConvert handling of nulls and variables in round tripping

Modified:
    
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/thrift/ThriftConvert.java

Modified: 
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/thrift/ThriftConvert.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/thrift/ThriftConvert.java?rev=1624022&r1=1624021&r2=1624022&view=diff
==============================================================================
--- 
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/thrift/ThriftConvert.java
 (original)
+++ 
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/thrift/ThriftConvert.java
 Wed Sep 10 15:10:15 2014
@@ -212,6 +212,11 @@ public class ThriftConvert
     }
     
     public static void toThrift(Node node, PrefixMap pmap, RDF_Term term, 
boolean allowValues) {
+        if ( node == null) {
+            term.setUndefined(TRDF.UNDEF);
+            return;
+        }
+        
         if ( node.isURI() ) {
             RDF_PrefixName prefixName = contract(node.getURI(), pmap) ;
             if ( prefixName != null ) {
@@ -259,7 +264,7 @@ public class ThriftConvert
             return ;
         }
         
-        if ( Var.isVar(node) ) {
+        if ( node.isVariable() ) {
             RDF_VAR var = new RDF_VAR(node.getName()) ;
             term.setVariable(var) ;
             return ;