EA-22260 - NPE: LowerFunction.evaluate

jaxen updated to 1.1.3 with sources

.idea/libraries/Jaxen.xml

@@ -1,9 +1,12 @@
 <component name="libraryTable">
   <library name="Jaxen">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/jaxen-1.1.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/jaxen-1.1.3.jar!/"/>
     </CLASSES>
-    <JAVADOC />
+    <JAVADOC/>
-    <SOURCES />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/lib/src/jaxen-1.1.3-src.zip!/jaxen-1.1.3/src/java/main"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/jaxen-1.1.3-src.zip!/jaxen-1.1.3/src/java/test"/>
+    </SOURCES>
   </library>
 </component>

lib/required_for_dist.txt

@@ -42,7 +42,7 @@ yjp-controller-api-redist.jar
 jna.jar
 jna-utils.jar
 groovy-all-1.6.3.jar
-jaxen-1.1.1.jar
+jaxen-1.1.3.jar
 commons-net-1.4.1.jar
 serviceMessages.jar
 xbean.jar

license/jaxen_license.txt

@@ -0,0 +1,33 @@
+/*
+ $Id: LICENSE.txt 1128 2006-02-05 21:49:04Z elharo $
+
+ Copyright 2003-2006 The Werken Company. All Rights Reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+  * Neither the name of the Jaxen Project nor the names of its
+    contributors may be used to endorse or promote products derived 
+    from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ */

plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/support/jaxen/PsiDocumentNavigator.java

@@ -17,6 +17,7 @@ package org.intellij.plugins.xpathView.support.jaxen;
 
 import com.intellij.lang.xml.XMLLanguage;
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
@@ -27,6 +28,7 @@ import org.jaxen.FunctionCallException;
 import org.jaxen.UnsupportedAxisException;
 import org.jaxen.XPath;
 import org.jaxen.saxpath.SAXPathException;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Collections;
 import java.util.Iterator;
@@ -147,6 +149,7 @@ public class PsiDocumentNavigator extends DefaultNavigator {
         return text;
     }
 
+    @NotNull
     public String getProcessingInstructionData(Object obj) {
         LOG.debug("enter: getProcessingInstructionData");
         LOG.assertTrue(obj instanceof XmlProcessingInstruction);
@@ -327,6 +330,7 @@ public class PsiDocumentNavigator extends DefaultNavigator {
         return b;
     }
 
+    @NotNull
     public String getCommentStringValue(Object comment) {
         LOG.assertTrue(comment instanceof XmlComment);
 
@@ -344,6 +348,7 @@ public class PsiDocumentNavigator extends DefaultNavigator {
         return "";
     }
 
+    @NotNull
     public String getElementStringValue(Object element) {
         LOG.assertTrue(element instanceof XmlTag);
 
@@ -356,9 +361,10 @@ public class PsiDocumentNavigator extends DefaultNavigator {
         return collector.getText();
     }
 
+    @NotNull
     public String getAttributeStringValue(Object attr) {
         LOG.assertTrue(attr instanceof XmlAttribute);
-        return ((XmlAttribute)attr).getValue();
+        return StringUtil.notNullize(((XmlAttribute)attr).getValue());
     }
 
     public String getNamespaceStringValue(Object ns) {
@@ -379,6 +385,7 @@ public class PsiDocumentNavigator extends DefaultNavigator {
         return null;
     }
 
+    @NotNull
     public String getTextStringValue(Object txt) {
         LOG.debug("enter: getTextStringValue");