Changeset 7488

Timestamp:

11/24/06 14:19:51 (5 years ago)

Author:

sys

Message:

bug bloquant xsl:attribute dans certaines conditions

File:

• trunk/Res_Xalan/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM.java (modified) (9 diffs)

trunk/Res_Xalan/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM.java

@@ -21 +21 @@
 import java.util.Hashtable;
 import java.util.Vector;
+
 import javax.xml.transform.Source;
 import javax.xml.transform.SourceLocator;
 
-import org.apache.xml.dtm.*;
-import org.apache.xml.dtm.ref.*;
-import org.apache.xml.utils.StringVector;
-import org.apache.xml.utils.IntVector;
+import org.apache.xml.dtm.DTM;
+import org.apache.xml.dtm.DTMManager;
+import org.apache.xml.dtm.DTMWSFilter;
+import org.apache.xml.dtm.ref.DTMDefaultBaseIterators;
+import org.apache.xml.dtm.ref.DTMManagerDefault;
+import org.apache.xml.dtm.ref.DTMStringPool;
+import org.apache.xml.dtm.ref.DTMTreeWalker;
+import org.apache.xml.dtm.ref.NodeLocator;
+import org.apache.xml.res.XMLErrorResources;
+import org.apache.xml.res.XMLMessages;
 import org.apache.xml.utils.FastStringBuffer;
 import org.apache.xml.utils.IntStack;
+import org.apache.xml.utils.IntVector;
+import org.apache.xml.utils.StringVector;
 import org.apache.xml.utils.SuballocatedIntVector;
 import org.apache.xml.utils.SystemIDResolver;
-import org.apache.xml.utils.WrappedRuntimeException;
 import org.apache.xml.utils.XMLString;
 import org.apache.xml.utils.XMLStringFactory;
-import org.apache.xml.res.XMLErrorResources;
-import org.apache.xml.res.XMLMessages;
-import org.xml.sax.*;
-import org.xml.sax.ext.*;
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.DTDHandler;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.ext.DeclHandler;
+import org.xml.sax.ext.LexicalHandler;
 
 /**
@@ -50 +65 @@
   /** Set true to monitor SAX events and similar diagnostic info. */
   private static final boolean DEBUG = false;
-
-  /**
-   * If we're building the model incrementally on demand, we need to
-   * be able to tell the source when to send us more data.
-   *
-   * Note that if this has not been set, and you attempt to read ahead
-   * of the current build point, we'll probably throw a null-pointer
-   * exception. We could try to wait-and-retry instead, as a very poor
-   * fallback, but that has all the known problems with multithreading
-   * on multiprocessors and we Don't Want to Go There.
-   *
-   * @see setIncrementalSAXSource
-   */
-  private IncrementalSAXSource m_incrementalSAXSource = null;
 
   /**
@@ -347 +348 @@
   public void clearCoRoutine(boolean callDoTerminate)
   {
-
-    if (null != m_incrementalSAXSource)
-    {
-      if (callDoTerminate)
-        m_incrementalSAXSource.deliverMoreNodes(false);
-
-      m_incrementalSAXSource = null;
-    }
-  }
-
-  /**
-   * Bind a IncrementalSAXSource to this DTM. If we discover we need nodes
-   * that have not yet been built, we will ask this object to send us more
-   * events, and it will manage interactions with its data sources.
-   *
-   * Note that we do not actually build the IncrementalSAXSource, since we don't
-   * know what source it's reading from, what thread that source will run in,
-   * or when it will run.
-   *
-   * @param incrementalSAXSource The parser that we want to recieve events from
-   * on demand.
-   * @param appCoRID The CoRoutine ID for the application.
-   */
-  public void setIncrementalSAXSource(IncrementalSAXSource incrementalSAXSource)
-  {
-
-    // Establish coroutine link so we can request more data
-    //
-    // Note: It's possible that some versions of IncrementalSAXSource may
-    // not actually use a CoroutineManager, and hence may not require
-    // that we obtain an Application Coroutine ID. (This relies on the
-    // coroutine transaction details having been encapsulated in the
-    // IncrementalSAXSource.do...() methods.)
-    m_incrementalSAXSource = incrementalSAXSource;
-
-    // Establish SAX-stream link so we can receive the requested data
-    incrementalSAXSource.setContentHandler(this);
-    incrementalSAXSource.setLexicalHandler(this);
-    incrementalSAXSource.setDTDHandler(this);
-
-    // Are the following really needed? incrementalSAXSource doesn't yet
-    // support them, and they're mostly no-ops here...
-    //incrementalSAXSource.setErrorHandler(this);
-    //incrementalSAXSource.setDeclHandler(this);
   }
 
@@ -407 +364 @@
   public ContentHandler getContentHandler()
   {
-
-    if (m_incrementalSAXSource instanceof IncrementalSAXSource_Filter)
-      return (ContentHandler) m_incrementalSAXSource;
-    else
       return this;
   }
@@ -426 +379 @@
   public LexicalHandler getLexicalHandler()
   {
-
-    if (m_incrementalSAXSource instanceof IncrementalSAXSource_Filter)
-      return (LexicalHandler) m_incrementalSAXSource;
-    else
       return this;
   }
@@ -481 +430 @@
   public boolean needsTwoThreads()
   {
-    return null != m_incrementalSAXSource;
+    return false;
   }
 
@@ -519 +468 @@
       int length = m_data.elementAt(dataIndex + 1);
 
-      if(normalize)
-        m_chars.sendNormalizedSAXcharacters(ch, offset, length);
-      else
-        m_chars.sendSAXcharacters(ch, offset, length);
+      //On n'envoie que si du texte doit etre envoyé (sinon xsl:attribute ne marche plus).
+      if(length > 0) {
+              if(normalize)
+                m_chars.sendNormalizedSAXcharacters(ch, offset, length);
+              else
+                m_chars.sendSAXcharacters(ch, offset, length);
+      }
     }
     else
@@ -718 +670 @@
     identity += 1;
 
-    while (identity >= m_size)
-    {
-      if (null == m_incrementalSAXSource)
-        return DTM.NULL;
-
-      nextNode();
+    if (identity >= m_size)
+    {
+      return DTM.NULL;
     }
 
@@ -780 +729 @@
   protected boolean nextNode()
   {
-
-    if (null == m_incrementalSAXSource)
-      return false;
-
-    if (m_endDocumentOccured)
-    {
-      clearCoRoutine();
-
-      return false;
-    }
-
-    Object gotMore = m_incrementalSAXSource.deliverMoreNodes(true);
-
-    // gotMore may be a Boolean (TRUE if still parsing, FALSE if
-    // EOF) or an exception if IncrementalSAXSource malfunctioned
-    // (code error rather than user error).
-    //
-    // %REVIEW% Currently the ErrorHandlers sketched herein are
-    // no-ops, so I'm going to initially leave this also as a
-    // no-op.
-    if (!(gotMore instanceof Boolean))
-    {
-      if(gotMore instanceof RuntimeException)
-      {
-        throw (RuntimeException)gotMore;
-      }
-      else if(gotMore instanceof Exception)
-      {
-        throw new WrappedRuntimeException((Exception)gotMore);
-      }
-      // for now...
-      clearCoRoutine();
-
-      return false;
-
-      // %TBD%
-    }
-
-    if (gotMore != Boolean.TRUE)
-    {
-
-      // EOF reached without satisfying the request
-      clearCoRoutine();  // Drop connection, stop trying
-
-      // %TBD% deregister as its listener?
-    }
-
-    return true;
+    return false;
   }