cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject svn commit: r446919 - in /cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/location: LocationAttributes.java LocationUtils.java
Date Sat, 16 Sep 2006 19:19:26 GMT
Author: vgritsenko
Date: Sat Sep 16 12:19:25 2006
New Revision: 446919

URL: http://svn.apache.org/viewvc?view=rev&rev=446919
Log:
surround element name with angle brackets (like sitemap does).
fix possible NPE.

Modified:
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/location/LocationAttributes.java
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/location/LocationUtils.java

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/location/LocationAttributes.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/location/LocationAttributes.java?view=diff&rev=446919&r1=446918&r2=446919
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/location/LocationAttributes.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/location/LocationAttributes.java
Sat Sep 16 12:19:25 2006
@@ -172,7 +172,7 @@
             return Location.UNKNOWN;
         }
 
-        return new LocationImpl(description == null ? elem.getNodeName() : description,
+        return new LocationImpl(description == null ? "<" + elem.getNodeName() + ">"
: description,
                                 srcAttr.getValue(), getLine(elem), getColumn(elem));
     }
 

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/location/LocationUtils.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/location/LocationUtils.java?view=diff&rev=446919&r1=446918&r2=446919
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/location/LocationUtils.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/location/LocationUtils.java
Sat Sep 16 12:19:25 2006
@@ -260,6 +260,7 @@
                     newFinders.remove(ref);
                     finders = newFinders;
                 }
+                continue;
             }
 
             Location result = finder.getLocation(obj, description);



Mime
View raw message