svn commit: r1438497 - in /manifoldcf/branches/release-1.1-branch: ./ CHANGES.txt connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java

[kwright]

Author: kwright
Date: Fri Jan 25 13:22:55 2013
New Revision: 1438497

URL: http://svn.apache.org/viewvc?rev=1438497&view=rev
Log:
Pull up fix for CONNECTORS-622.

Modified:
    manifoldcf/branches/release-1.1-branch/   (props changed)
    manifoldcf/branches/release-1.1-branch/CHANGES.txt
    
manifoldcf/branches/release-1.1-branch/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java

Propchange: manifoldcf/branches/release-1.1-branch/
------------------------------------------------------------------------------
  Merged /manifoldcf/trunk:r1438458

Modified: manifoldcf/branches/release-1.1-branch/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.1-branch/CHANGES.txt?rev=1438497&r1=1438496&r2=1438497&view=diff
==============================================================================
--- manifoldcf/branches/release-1.1-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.1-branch/CHANGES.txt Fri Jan 25 13:22:55 2013
@@ -3,6 +3,9 @@ $Id$
 
 ======================= Release 1.1 =====================
 
+CONNECTORS-622: CMIS Connector returns NPE trying to get an empty boolean or 
date value
+(Piergiorgio Lucidi)
+
 CONNECTORS-617: Simple report NPE under Derby.
 (Karl Wright)
 

Modified: 
manifoldcf/branches/release-1.1-branch/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.1-branch/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java?rev=1438497&r1=1438496&r2=1438497&view=diff
==============================================================================
--- 
manifoldcf/branches/release-1.1-branch/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java
 (original)
+++ 
manifoldcf/branches/release-1.1-branch/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java
 Fri Jan 25 13:22:55 2013
@@ -755,7 +755,7 @@ public class CmisRepositoryConnector ext
   public void viewConfiguration(IThreadContext threadContext, IHTTPOutput out,
       Locale locale, ConfigParams parameters) throws ManifoldCFException, 
IOException {
     Map<String,String> paramMap = new HashMap<String,String>();
-       
+  
     // Fill in map from each tab
     fillInServerConfigurationMap(paramMap, parameters);
 
@@ -810,7 +810,7 @@ public class CmisRepositoryConnector ext
     // Fill in the parameters
     fillInServerConfigurationMap(paramMap, parameters);
     outputResource(EDIT_CONFIG_FORWARD_SERVER, out, locale, paramMap);
-       
+  
   }
 
   /**
@@ -912,7 +912,7 @@ public class CmisRepositoryConnector ext
   @Override
   public void viewSpecification(IHTTPOutput out, Locale locale, 
DocumentSpecification ds)
       throws ManifoldCFException, IOException {
-       
+  
     Map<String,String> paramMap = new HashMap<String,String>();
 
     // Fill in the map with data from all tabs
@@ -1004,9 +1004,9 @@ public class CmisRepositoryConnector ext
       Locale locale, DocumentSpecification ds, List<String> tabsArray)
       throws ManifoldCFException, IOException {
     tabsArray.add(Messages.getString(locale,CMIS_QUERY_TAB_PROPERTY));
-       
+  
     Map<String,String> paramMap = new HashMap<String,String>();
-       
+  
     // Fill in the specification header map, using data from all tabs.
     fillInCMISQuerySpecificationMap(paramMap, ds);
 
@@ -1104,8 +1104,9 @@ public class CmisRepositoryConnector ext
                   }
                 } else {
                   String stringValue = (String) property.getValue();
-                  rd.addField(propertyId, stringValue);
-                  
+                  if(StringUtils.isNotEmpty(stringValue)){
+                    rd.addField(propertyId, stringValue);
+                  }
                 }
                 break;
      
@@ -1117,7 +1118,9 @@ public class CmisRepositoryConnector ext
                   }
                 } else {
                   Boolean booleanValue = (Boolean) property.getValue();
-                  rd.addField(propertyId, booleanValue.toString());
+                  if(booleanValue!=null){
+                    rd.addField(propertyId, booleanValue.toString());
+                  }
                 }
                 break;
 
@@ -1129,7 +1132,9 @@ public class CmisRepositoryConnector ext
                   }
                 } else {
                   BigInteger integerValue = (BigInteger) property.getValue();
-                  rd.addField(propertyId, integerValue.toString());
+                  if(integerValue!=null){
+                    rd.addField(propertyId, integerValue.toString());
+                  }
                 }
                 break;
 
@@ -1141,7 +1146,9 @@ public class CmisRepositoryConnector ext
                   }
                 } else {
                   BigDecimal decimalValue = (BigDecimal) property.getValue();
-                  rd.addField(propertyId, decimalValue.toString());
+                  if(decimalValue!=null){
+                    rd.addField(propertyId, decimalValue.toString());
+                  }
                 }
                 break;
 
@@ -1154,8 +1161,9 @@ public class CmisRepositoryConnector ext
                   }
                 } else {
                   GregorianCalendar dateValue = (GregorianCalendar) 
property.getValue();
-                  rd.addField(propertyId,
-                      ISO8601_DATE_FORMATTER.format(dateValue.getTime()));
+                  if(dateValue!=null){
+                    rd.addField(propertyId, 
ISO8601_DATE_FORMATTER.format(dateValue.getTime()));
+                  }
                 }
                 break;