vgritsenko 2003/12/22 13:01:31
Modified: src/blocks/woody/java/org/apache/cocoon/woody/transformation
WidgetReplacingPipe.java
Log:
Fix NPEs in woody: Namespace can be null.
Revision Changes Path
1.18 +4 -5
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/transformation/WidgetReplacingPipe.java
Index: WidgetReplacingPipe.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/transformation/WidgetReplacingPipe.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- WidgetReplacingPipe.java 22 Dec 2003 16:43:11 -0000 1.17
+++ WidgetReplacingPipe.java 22 Dec 2003 21:01:30 -0000 1.18
@@ -157,7 +157,7 @@
gotStylingElement = true;
}
saxBuffer.startElement(namespaceURI, localName, qName,
attributes);
- } else if (namespaceURI.equals(Constants.WT_NS)) {
+ } else if (Constants.WT_NS.equals(namespaceURI)) {
if (localName.equals(WIDGET) ||
localName.equals(REPEATER_WIDGET)) {
checkContextWidgetAvailable(qName);
inWidgetElement = true;
@@ -344,8 +344,7 @@
throws SAXException {
if (inWidgetElement) {
- if (elementNestingCounter == widgetElementNesting &&
- namespaceURI.equals(Constants.WT_NS)
+ if (elementNestingCounter == widgetElementNesting &&
Constants.WT_NS.equals(namespaceURI)
&& (localName.equals(WIDGET) ||
localName.equals(REPEATER_WIDGET))) {
if (repeaterWidget) {
Repeater repeater = (Repeater)widget;
@@ -373,7 +372,7 @@
} else {
saxBuffer.endElement(namespaceURI, localName, qName);
}
- } else if (namespaceURI.equals(Constants.WT_NS)) {
+ } else if (Constants.WT_NS.equals(namespaceURI)) {
if (localName.equals(WIDGET_LABEL) ||
localName.equals(REPEATER_WIDGET_LABEL)
|| localName.equals(REPEATER_SIZE) ||
localName.equals(CONTINUATION_ID)) {
// Do nothing
