Skip to content

Commit

Permalink
resolve merge conflict between dfc19d8 and PR #1760
Browse files Browse the repository at this point in the history
  • Loading branch information
flavorjones committed Dec 4, 2018
1 parent d33a9f6 commit 2b0d504
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions ext/java/nokogiri/internals/XalanDTMManagerPatch.java
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,7 @@ public final class XalanDTMManagerPatch extends org.apache.xml.dtm.ref.DTMManage
// Have each DTM cache last DOM node search?
for(int i = 0; i < m_dtms.length; i++) {
DTM thisDTM = m_dtms[i];
if (thisDTM instanceof DOM2DTMExt) {
int handle = ((DOM2DTMExt) thisDTM).getHandleOfNode(node);
if (handle != DTM.NULL) {
return handle;
}
} else if (thisDTM instanceof DOM2DTM) {
if (thisDTM instanceof DOM2DTM) {
int handle = ((DOM2DTM) thisDTM).getHandleOfNode(node);
if (handle != DTM.NULL) {
return handle;
Expand Down

1 comment on commit 2b0d504

@WoolenWang
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this commit bring the bug #1873 ?
.... chnflict resolve be more carefully, thanks..

Please sign in to comment.