@@ -312,7 +312,7 @@ public void analyze(final AnalyzeContextInfo contextInfo) throws XPathException
312
312
contextStepTest = cStep .getTest ();
313
313
314
314
if ((contextStepTest .getType () == Type .ATTRIBUTE || contextStepTest .getType () == Type .TEXT ) &&
315
- contextStepTest != stepTest ) {
315
+ ! contextStepTest . equals ( stepTest ) ) {
316
316
// return empty sequence
317
317
contextInfo .setStaticType (Type .EMPTY );
318
318
staticReturnType = Type .EMPTY ;
@@ -598,7 +598,7 @@ protected Sequence getAttributes(final XQueryContext context, final Sequence con
598
598
final DocumentSet docs = getDocumentSet (contextSet );
599
599
synchronized (context ) {
600
600
if (currentSet == null || currentDocs == null || (
601
- !optimized && !(docs == currentDocs || docs .equalDocs (currentDocs )))) {
601
+ !optimized && !(docs . equals ( currentDocs ) || docs .equalDocs (currentDocs )))) {
602
602
final StructuralIndex index = context .getBroker ().getStructuralIndex ();
603
603
if (context .getProfiler ().isEnabled ()) {
604
604
context .getProfiler ().message (
@@ -686,7 +686,7 @@ private Sequence getChildren(final XQueryContext context, final Sequence context
686
686
// TODO : understand why this one is different from the other
687
687
// ones
688
688
if (currentSet == null || currentDocs == null || (
689
- !optimized && !(docs == currentDocs || docs .equalDocs (currentDocs )))) {
689
+ !optimized && !(docs . equals ( currentDocs ) || docs .equalDocs (currentDocs )))) {
690
690
final StructuralIndex index = context .getBroker ().getStructuralIndex ();
691
691
if (context .getProfiler ().isEnabled ()) {
692
692
context .getProfiler ().message (
@@ -743,10 +743,9 @@ private Sequence getDescendants(final XQueryContext context, final Sequence cont
743
743
} else if (hasPreloadedData ()) {
744
744
final DocumentSet docs = getDocumentSet (contextSet );
745
745
synchronized (context ) {
746
- // TODO : understand why this one is different from the other
747
- // ones
746
+ // TODO : understand why this one is different from the other ones
748
747
if (currentSet == null || currentDocs == null || (
749
- !optimized && !(docs == currentDocs || docs .equalDocs (currentDocs )))) {
748
+ !optimized && !(docs . equals ( currentDocs ) || docs .equalDocs (currentDocs )))) {
750
749
final StructuralIndex index = context .getBroker ().getStructuralIndex ();
751
750
if (context .getProfiler ().isEnabled ()) {
752
751
context .getProfiler ().message (
@@ -821,8 +820,7 @@ protected Sequence getSiblings(final XQueryContext context, final Sequence conte
821
820
}
822
821
823
822
final NodeSet contextSet = contextSequence .toNodeSet ();
824
- // TODO : understand this. I guess comments should be treated in a
825
- // similar way ? -pb
823
+ // TODO : understand this. I guess comments should be treated in a similar way ? -pb
826
824
if (test .getType () == Type .PROCESSING_INSTRUCTION ) {
827
825
final VirtualNodeSet vset = new VirtualNodeSet (context .getBroker (), axis ,
828
826
test , contextId , contextSet );
@@ -1147,8 +1145,8 @@ protected Sequence getParents(final XQueryContext context, final Sequence contex
1147
1145
} else if (hasPreloadedData ()) {
1148
1146
final DocumentSet docs = getDocumentSet (contextSet );
1149
1147
synchronized (context ) {
1150
- if (currentSet == null || currentDocs == null ||
1151
- ( !optimized && !(docs == currentDocs || docs .equalDocs (currentDocs )))) {
1148
+ if (currentSet == null || currentDocs == null || (
1149
+ !optimized && !(docs . equals ( currentDocs ) || docs .equalDocs (currentDocs )))) {
1152
1150
final StructuralIndex index = context .getBroker ().getStructuralIndex ();
1153
1151
if (context .getProfiler ().isEnabled ()) {
1154
1152
context .getProfiler ().message (
0 commit comments