forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r700037 - in /forrest/trunk/whiteboard/dispatcher: java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathPatched.java testing/org/apache/forrest/dispatcher/master.advanced.structurer.xml
Date Mon, 29 Sep 2008 09:39:57 GMT
Author: thorsten
Date: Mon Sep 29 02:39:56 2008
New Revision: 700037

URL: http://svn.apache.org/viewvc?rev=700037&view=rev
Log:
 Fixing infinitive loop in AXIOMXPathPatched

Modified:
    forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathPatched.java
    forrest/trunk/whiteboard/dispatcher/testing/org/apache/forrest/dispatcher/master.advanced.structurer.xml

Modified: forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathPatched.java
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathPatched.java?rev=700037&r1=700036&r2=700037&view=diff
==============================================================================
--- forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathPatched.java
(original)
+++ forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/impl/helper/AXIOMXPathPatched.java
Mon Sep 29 02:39:56 2008
@@ -67,15 +67,14 @@
 
   private Object createNode(OMElement root, String path, String rest)
       throws JaxenException {
-    String m_xpath = path;
     Object xpathNode = null;
     while (true) {
-      AXIOMXPath xpath = getNsXPath(m_xpath);
+      AXIOMXPath xpath = getNsXPath(path);
       xpathNode = xpath.selectSingleNode(root);
       if (xpathNode == null) {
         int endIndex = path.lastIndexOf("/");
-        m_xpath = path.substring(0, endIndex);
         rest = path.substring(endIndex + 1) + "/" + rest;
+        path = path.substring(0, endIndex);
       } else if (xpathNode != null) {
         xpathNode = calculatePath(root, (OMElement) xpathNode, rest);
         break;

Modified: forrest/trunk/whiteboard/dispatcher/testing/org/apache/forrest/dispatcher/master.advanced.structurer.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/dispatcher/testing/org/apache/forrest/dispatcher/master.advanced.structurer.xml?rev=700037&r1=700036&r2=700037&view=diff
==============================================================================
--- forrest/trunk/whiteboard/dispatcher/testing/org/apache/forrest/dispatcher/master.advanced.structurer.xml
(original)
+++ forrest/trunk/whiteboard/dispatcher/testing/org/apache/forrest/dispatcher/master.advanced.structurer.xml
Mon Sep 29 02:39:56 2008
@@ -26,9 +26,7 @@
       <hook id="level2">
         <contract name="master">
           <property name="test-inline" value="position:hook/hook/contract" />
-          <!-- FIXME: /html/body/hook/hook/hook is causing an infinitive loop
-          Need to find the reason why and create a way to get out of this loop. -->
-           <property name="injectPointBody" value="/html/body/forrest:hook/forrest:hook/forrest:hook"
/> 
+          <property name="injectPointBody" value="/html/body/hook/hook/hook" /> 
         </contract>
       </hook>
     </hook>



Mime
View raw message