svn commit: r1049787 - in /oodt/trunk: CHANGES.txt opendapps/src/main/java/org/apache/oodt/opendapps/DatasetCrawler.java

[mattmann]

Author: mattmann
Date: Thu Dec 16 05:38:20 2010
New Revision: 1049787

URL: http://svn.apache.org/viewvc?rev=1049787&view=rev
Log:
- fix for OODT-85 XML configurator for opendap crashes on null pointer 
exceptions for some datasets

Modified:
    oodt/trunk/CHANGES.txt
    
oodt/trunk/opendapps/src/main/java/org/apache/oodt/opendapps/DatasetCrawler.java

Modified: oodt/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1049787&r1=1049786&r2=1049787&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Thu Dec 16 05:38:20 2010
@@ -4,6 +4,8 @@ Apache OODT Change Log
 Release 0.2 (Current Development)
 --------------------------------------------
 
+* OODT-85 XML configurator for opendap crashes on null pointer exceptions for 
some datasets (Victor Hwang via mattmann)
+
 * OODT-78 Ability for Resource Manager to dynamically add/remove nodes and 
modify queues at run-time (bfoster)
 
 * OODT-79 LRUScheduler removes a job from the JobQueue, but adds it back if 
can't schedule it, which (in the 

Modified: 
oodt/trunk/opendapps/src/main/java/org/apache/oodt/opendapps/DatasetCrawler.java
URL: 
http://svn.apache.org/viewvc/oodt/trunk/opendapps/src/main/java/org/apache/oodt/opendapps/DatasetCrawler.java?rev=1049787&r1=1049786&r2=1049787&view=diff
==============================================================================
--- 
oodt/trunk/opendapps/src/main/java/org/apache/oodt/opendapps/DatasetCrawler.java
 (original)
+++ 
oodt/trunk/opendapps/src/main/java/org/apache/oodt/opendapps/DatasetCrawler.java
 Thu Dec 16 05:38:20 2010
@@ -152,9 +152,15 @@ public class DatasetCrawler implements C
       }
     }
 
-    this.addIfNotNull(met, "DataFormatType", dataset.getDataFormatType()
-        .toString());
-    this.addIfNotNull(met, "DataType", dataset.getDataType().toString());
+    if (dataset.getDataFormatType() != null){
+       this.addIfNotNull(met, "DataFormatType", dataset.getDataFormatType()
+                       .toString());
+    }
+    
+    if (dataset.getDataType() != null){
+       this.addIfNotNull(met, "DataType", dataset.getDataType().toString());
+    }
+    
     if (dataset.getDates() != null) {
       for (DateType dateType : dataset.getDates()) {
         String dateString = null;
@@ -267,7 +273,7 @@ public class DatasetCrawler implements C
       this.addIfNotNull(met, "EndDateTime", endDateTimeStr);
     }
 
-    if (dataset.getTimeCoverage().getResolution() != null) {
+    if (dataset.getTimeCoverage() != null && 
dataset.getTimeCoverage().getResolution() != null) {
       this.addIfNotNull(met, "TimeCoverageResolution", dataset
           .getTimeCoverage().getResolution().getText());
     }