summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIBM_ADMIN2014-05-15 08:23:43 (EDT)
committerIBM_ADMIN2014-05-15 08:23:43 (EDT)
commit5189f67e23ad7d782c42e6d6024a5ff1126a358c (patch)
treeffb6cbcb938f02181d951eb602f00b279b496b85
parent0aad42dafb57ac8631a7e70cc938df68b24393da (diff)
downloadwebtools.sourceediting.xpath-5189f67e23ad7d782c42e6d6024a5ff1126a358c.zip
webtools.sourceediting.xpath-5189f67e23ad7d782c42e6d6024a5ff1126a358c.tar.gz
webtools.sourceediting.xpath-5189f67e23ad7d782c42e6d6024a5ff1126a358c.tar.bz2
[xpath2] fixing an anyURI equality check bug. other minor code cleanups
as well.
-rw-r--r--bundles/org.eclipse.wst.xml.xpath2.processor/src/org/eclipse/wst/xml/xpath2/processor/internal/function/FsEq.java1
-rw-r--r--bundles/org.eclipse.wst.xml.xpath2.processor/src/org/eclipse/wst/xml/xpath2/processor/internal/function/FsPlus.java3
-rw-r--r--bundles/org.eclipse.wst.xml.xpath2.processor/src/org/eclipse/wst/xml/xpath2/processor/internal/types/XSAnyURI.java2
3 files changed, 1 insertions, 5 deletions
diff --git a/bundles/org.eclipse.wst.xml.xpath2.processor/src/org/eclipse/wst/xml/xpath2/processor/internal/function/FsEq.java b/bundles/org.eclipse.wst.xml.xpath2.processor/src/org/eclipse/wst/xml/xpath2/processor/internal/function/FsEq.java
index 578e72a..2a5c342 100644
--- a/bundles/org.eclipse.wst.xml.xpath2.processor/src/org/eclipse/wst/xml/xpath2/processor/internal/function/FsEq.java
+++ b/bundles/org.eclipse.wst.xml.xpath2.processor/src/org/eclipse/wst/xml/xpath2/processor/internal/function/FsEq.java
@@ -227,7 +227,6 @@ public class FsEq extends Function {
if (ex instanceof DynamicError)
throw (DynamicError) ex;
- ex.printStackTrace();
}
if (((XSBoolean) result.first()).value())
diff --git a/bundles/org.eclipse.wst.xml.xpath2.processor/src/org/eclipse/wst/xml/xpath2/processor/internal/function/FsPlus.java b/bundles/org.eclipse.wst.xml.xpath2.processor/src/org/eclipse/wst/xml/xpath2/processor/internal/function/FsPlus.java
index edde7a5..fc8dc25 100644
--- a/bundles/org.eclipse.wst.xml.xpath2.processor/src/org/eclipse/wst/xml/xpath2/processor/internal/function/FsPlus.java
+++ b/bundles/org.eclipse.wst.xml.xpath2.processor/src/org/eclipse/wst/xml/xpath2/processor/internal/function/FsPlus.java
@@ -226,9 +226,6 @@ public class FsPlus extends Function {
if (ex instanceof DynamicError) {
throw (DynamicError) ex;
}
- else {
- ex.printStackTrace();
- }
}
return null; // unreach!
}
diff --git a/bundles/org.eclipse.wst.xml.xpath2.processor/src/org/eclipse/wst/xml/xpath2/processor/internal/types/XSAnyURI.java b/bundles/org.eclipse.wst.xml.xpath2.processor/src/org/eclipse/wst/xml/xpath2/processor/internal/types/XSAnyURI.java
index 3107bc9..3429cad 100644
--- a/bundles/org.eclipse.wst.xml.xpath2.processor/src/org/eclipse/wst/xml/xpath2/processor/internal/types/XSAnyURI.java
+++ b/bundles/org.eclipse.wst.xml.xpath2.processor/src/org/eclipse/wst/xml/xpath2/processor/internal/types/XSAnyURI.java
@@ -119,7 +119,7 @@ public class XSAnyURI extends CtrType implements CmpEq, CmpGt, CmpLt {
*/
public boolean eq(AnyType arg, DynamicContext context) throws DynamicError {
if (arg instanceof XSAnyURI || arg instanceof XSString) {
- if (this.string_value().equals(arg.string_value())) {
+ if (_value != null && _value.equals(arg.string_value())) {
return true;
}
} else {