svn commit: r156579 - in jakarta/commons/proper/feedparser/trunk/src/java/org/apache/commons/feedparser: AtomFeedParser.java BaseParser.java RSSFeedParser.java

[burton]

Author: burton
Date: Tue Mar  8 15:05:22 2005
New Revision: 156579

URL: http://svn.apache.org/viewcvs?view=rev&rev=156579
Log:
Fixed bug with doLocale passing in a null element... 

Modified:
    
jakarta/commons/proper/feedparser/trunk/src/java/org/apache/commons/feedparser/AtomFeedParser.java
    
jakarta/commons/proper/feedparser/trunk/src/java/org/apache/commons/feedparser/BaseParser.java
    
jakarta/commons/proper/feedparser/trunk/src/java/org/apache/commons/feedparser/RSSFeedParser.java

Modified: 
jakarta/commons/proper/feedparser/trunk/src/java/org/apache/commons/feedparser/AtomFeedParser.java
URL: 
http://svn.apache.org/viewcvs/jakarta/commons/proper/feedparser/trunk/src/java/org/apache/commons/feedparser/AtomFeedParser.java?view=diff&r1=156578&r2=156579
==============================================================================
--- 
jakarta/commons/proper/feedparser/trunk/src/java/org/apache/commons/feedparser/AtomFeedParser.java
 (original)
+++ 
jakarta/commons/proper/feedparser/trunk/src/java/org/apache/commons/feedparser/AtomFeedParser.java
 Tue Mar  8 15:05:22 2005
@@ -306,6 +306,10 @@
      */
     private static String getXMLOfContent( List content ) {
 
+        //NOTE: Fri Mar 04 2005 03:59 PM ([EMAIL PROTECTED]): in my profiling I
+        //found that this is a BIG memory allocater.  FIXME: We SHOULD be able
+        //to do the same thing we do for xhtml:body RIGHT?
+        
         StringBuffer buff = new StringBuffer( 10000 ); 
                 
         XMLOutputter outputter = new XMLOutputter( "    ", true );

Modified: 
jakarta/commons/proper/feedparser/trunk/src/java/org/apache/commons/feedparser/BaseParser.java
URL: 
http://svn.apache.org/viewcvs/jakarta/commons/proper/feedparser/trunk/src/java/org/apache/commons/feedparser/BaseParser.java?view=diff&r1=156578&r2=156579
==============================================================================
--- 
jakarta/commons/proper/feedparser/trunk/src/java/org/apache/commons/feedparser/BaseParser.java
 (original)
+++ 
jakarta/commons/proper/feedparser/trunk/src/java/org/apache/commons/feedparser/BaseParser.java
 Tue Mar  8 15:05:22 2005
@@ -45,7 +45,10 @@
     protected static void doLocale( FeedParserState state,
                                     FeedParserListener listener,
                                     Element element ) throws Exception {
-        
+
+        if ( element == null )
+            return;
+
         if ( state.metaFeedParserlistener == null )
             return;
 
@@ -66,6 +69,9 @@
                                        FeedParserListener listener,
                                        Element element )
         throws Exception {
+
+        if ( element == null )
+            return;
 
         if ( state.metaFeedParserlistener == null )
             return;

Modified: 
jakarta/commons/proper/feedparser/trunk/src/java/org/apache/commons/feedparser/RSSFeedParser.java
URL: 
http://svn.apache.org/viewcvs/jakarta/commons/proper/feedparser/trunk/src/java/org/apache/commons/feedparser/RSSFeedParser.java?view=diff&r1=156578&r2=156579
==============================================================================
--- 
jakarta/commons/proper/feedparser/trunk/src/java/org/apache/commons/feedparser/RSSFeedParser.java
 (original)
+++ 
jakarta/commons/proper/feedparser/trunk/src/java/org/apache/commons/feedparser/RSSFeedParser.java
 Tue Mar  8 15:05:22 2005
@@ -63,6 +63,7 @@
         XPath xpath = new XPath( "/descendant::*[local-name() = 'channel']" );
         Element channel = (Element)xpath.selectSingleNode( doc );
         state.current = channel;
+
         doLocale( state, listener, channel );
         doChannel( listener, state );
         doLocaleEnd( state, listener, channel );
@@ -213,6 +214,9 @@
 
             if ( encoded != null ) {
 
+                //FIXME: move to the onContent API defined within the
+                //AtomFeedParser and deprecated this body handling.
+
                 mcpl.onContentEncoded( new FeedParserState( encoded ),
                                        encoded.getText() );
 
@@ -230,6 +234,9 @@
                                 .getChild( "item", NS.CONTENT )
                                     .getChild( "value", NS.RDF );
 
+                    //FIXME: move to the onContent API defined within the
+                    //AtomFeedParser and deprecated this body handling.
+
                     mcpl.onContentItem( new FeedParserState( value ),
                                         null,
                                         null,
@@ -251,6 +258,9 @@
 
             Element body = state.current.getChild( "body", NS.XHTML );
 
+            //FIXME: move to the onContent API defined within the 
AtomFeedParser
+            //and deprecated this body handling.
+            
             if ( body != null ) {
                 xfp.onXHTMLBody( new FeedParserState( body ),
                                  body );



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]