Scarab commit: svn commit: r10346 - trunk: . src/java/org/tigris/scarab/screens

Author: ronvoe122
Date: 2006-11-08 08:53:45-0800
New Revision: 10346

Modified:
   trunk/   (props changed)
   trunk/src/java/org/tigris/scarab/screens/RSSDataExport.java

Log:
Merged revisions 10322 via svnmerge from 
http://scarab.tigris.org/svn/scarab/branches/release/b21

........
  r10322 | dabbous | 2006-11-04 21:16:17 +0100 (Sa, 04 Nov 2006) | 4 lines
  
  avoid npe when feedType not given in RSSFeed.
  I basically do NOT know how the code should work
  properly. I just try to avoid an uncaught NPE!!
  The author should definitely review this class!
........


Modified: trunk/src/java/org/tigris/scarab/screens/RSSDataExport.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/screens/RSSDataExport.java?view=diff&rev=10346&p1=trunk/src/java/org/tigris/scarab/screens/RSSDataExport.java&p2=trunk/src/java/org/tigris/scarab/screens/RSSDataExport.java&r1=10345&r2=10346
==============================================================================
--- trunk/src/java/org/tigris/scarab/screens/RSSDataExport.java	(original)
+++ trunk/src/java/org/tigris/scarab/screens/RSSDataExport.java	2006-11-08 08:53:45-0800
@@ -80,7 +80,9 @@
 public class RSSDataExport extends TemplateScreen {
 	public static final String DEFAULT_FEED_FORMAT = "atom_0.3";
 
-	private static final String MIME_TYPE = "application/xml; charset=UTF-8";
+    private static final String MIME_TYPE = "application/xml; charset=UTF-8";
+
+    private static final String COULD_NOT_FIND_FEED_TYPE   = "Parser did not find a valid feedType";
 
 	private static final String COULD_NOT_GENERATE_FEED_ERROR = "Could not generate feed";
 
@@ -116,6 +118,14 @@
 
 
             String feedType = parser.getString(FEED_TYPE_KEY);
+            if(feedType == null)
+            {
+                String msg = COULD_NOT_FIND_FEED_TYPE;
+                Log.get().error(msg);
+                data.getResponse().sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,msg);            
+                return;
+            }
+
             String feedFormat = parser.getString(FEED_FORMAT_KEY);
 
             ScarabLink scarabLink= getScarabLinkTool(context);
@@ -163,6 +173,7 @@
             data.getResponse().sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,msg);
         }      		
 	}
+
 	
     /**
      * Helper method to retrieve the ScarabLocalizationTool from the Context