[Exist-commits] eXist-1.0/src/org/exist/xquery/functions FunNodeName.java,1.2,1.3

[Sebastian B. <bo...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9420/src/org/exist/xquery/functions

Modified Files:
	FunNodeName.java 
Log Message:
failed when contextSequence was empty (NPE)

Index: FunNodeName.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/FunNodeName.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FunNodeName.java	1 Sep 2004 17:41:31 -0000	1.2
--- FunNodeName.java	13 Sep 2004 09:36:03 -0000	1.3
***************
*** 76,80 ****
                  n = result.item(0);
          } else {
!             if(contextSequence.getLength() > 0 && contextSequence.getItemType() == Type.NODE)
                  n = ((NodeSet)contextSequence).item(0);
          }
--- 76,80 ----
                  n = result.item(0);
          } else {
!             if(contextSequence != null && contextSequence.getLength() > 0 && contextSequence.getItemType() == Type.NODE)
                  n = ((NodeSet)contextSequence).item(0);
          }
***************
*** 83,86 ****
--- 83,90 ----
                  case Node.ELEMENT_NODE:
                  case Node.ATTRIBUTE_NODE:
+                     QName qname = ((QNameable) n).getQName();
+                 	/*if (qname.getPrefix() != null) {
+                 	    context.declareNamespace(qname.getPrefix(), qname.getNamespaceURI());
+                 	}*/
                      retval = new QNameValue(context, ((QNameable) n).getQName());
                      break;