nokogiri 1.7.2-java → 1.8.0-java

data/{LICENSE.txt → LICENSE.md}

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2008 - 2016:
+Copyright (c) 2008 - 2017:
 
 * [Aaron Patterson](http://tenderlovemaking.com)
 * [Mike Dalessio](http://mike.daless.io)

data/Manifest.txt

@@ -7,7 +7,9 @@ CHANGELOG.md
 CONTRIBUTING.md
 C_CODING_STYLE.rdoc
 Gemfile
-LICENSE.txt
+Gemfile-libxml-ruby
+LICENSE-DEPENDENCIES.md
+LICENSE.md
 Manifest.txt
 README.md
 ROADMAP.md
@@ -54,7 +56,6 @@ ext/java/nokogiri/internals/ClosedStreamException.java
 ext/java/nokogiri/internals/HtmlDomParserContext.java
 ext/java/nokogiri/internals/IgnoreSchemaErrorsErrorHandler.java
 ext/java/nokogiri/internals/NokogiriBlockingQueueInputStream.java
-ext/java/nokogiri/internals/NokogiriDocumentCache.java
 ext/java/nokogiri/internals/NokogiriDomParser.java
 ext/java/nokogiri/internals/NokogiriEncodingReaderWrapper.java
 ext/java/nokogiri/internals/NokogiriEntityResolver.java
@@ -75,10 +76,10 @@ ext/java/nokogiri/internals/ReaderNode.java
 ext/java/nokogiri/internals/SaveContextVisitor.java
 ext/java/nokogiri/internals/SchemaErrorHandler.java
 ext/java/nokogiri/internals/UncloseableInputStream.java
+ext/java/nokogiri/internals/XalanDTMManagerPatch.java
 ext/java/nokogiri/internals/XmlDeclHandler.java
 ext/java/nokogiri/internals/XmlDomParserContext.java
 ext/java/nokogiri/internals/XmlSaxParser.java
-ext/java/nokogiri/internals/XsltExtensionFunction.java
 ext/java/nokogiri/internals/c14n/AttrCompare.java
 ext/java/nokogiri/internals/c14n/C14nHelper.java
 ext/java/nokogiri/internals/c14n/CanonicalFilter.java
@@ -106,6 +107,7 @@ ext/java/nokogiri/internals/c14n/NameSpaceSymbTable.java
 ext/java/nokogiri/internals/c14n/NodeFilter.java
 ext/java/nokogiri/internals/c14n/UtfHelpper.java
 ext/java/nokogiri/internals/c14n/XMLUtils.java
+ext/java/org/apache/xml/dtm/ref/dom2dtm/DOM2DTMExt.java
 ext/nokogiri/depend
 ext/nokogiri/extconf.rb
 ext/nokogiri/html_document.c
@@ -253,10 +255,6 @@ patches/libxslt/0001-Fix-heap-overread-in-xsltFormatNumberConversion.patch
 patches/libxslt/0002-Check-for-integer-overflow-in-xsltAddTextString.patch
 patches/sort-patches-by-date
 suppressions/README.txt
-suppressions/nokogiri_ree-1.8.7.358.supp
-suppressions/nokogiri_ruby-1.8.7.370.supp
-suppressions/nokogiri_ruby-1.9.2.320.supp
-suppressions/nokogiri_ruby-1.9.3.327.supp
 tasks/test.rb
 test/css/test_nthiness.rb
 test/css/test_parser.rb
@@ -366,4 +364,3 @@ test/xml/test_xinclude.rb
 test/xml/test_xpath.rb
 test/xslt/test_custom_functions.rb
 test/xslt/test_exception_handling.rb
-test_all

data/README.md

@@ -10,10 +10,13 @@
 
 ## Status
 
-[![Travis Build Status](https://travis-ci.org/sparklemotion/nokogiri.svg?branch=master)](https://travis-ci.org/sparklemotion/nokogiri)
-[![Appveyor Build Status](https://ci.appveyor.com/api/projects/status/github/sparklemotion/nokogiri?branch=master&svg=true)](https://ci.appveyor.com/project/flavorjones/nokogiri?branch=master)
-[![Code Climate](https://codeclimate.com/github/sparklemotion/nokogiri.svg)](https://codeclimate.com/github/sparklemotion/nokogiri)
-[![Version Eye](https://www.versioneye.com/ruby/nokogiri/badge.png)](https://www.versioneye.com/ruby/nokogiri)
+|System|Status|
+|--|--|
+| Concourse | [![Concourse CI](https://ci.nokogiri.org/api/v1/teams/nokogiri-core/pipelines/nokogiri/jobs/ruby-2.4-system/badge)](https://ci.nokogiri.org/teams/nokogiri-core/pipelines/nokogiri?groups=master) |
+| Travis | [![Travis Build Status](https://travis-ci.org/sparklemotion/nokogiri.svg?branch=master)](https://travis-ci.org/sparklemotion/nokogiri) |
+| Appveyor | [![Appveyor Build Status](https://ci.appveyor.com/api/projects/status/github/sparklemotion/nokogiri?branch=master&svg=true)](https://ci.appveyor.com/project/flavorjones/nokogiri?branch=master) |
+| Code Climate | [![Code Climate](https://codeclimate.com/github/sparklemotion/nokogiri.svg)](https://codeclimate.com/github/sparklemotion/nokogiri) |
+| Version Eye | [![Version Eye](https://www.versioneye.com/ruby/nokogiri/badge.png)](https://www.versioneye.com/ruby/nokogiri) |
 
 
 ## Description
@@ -167,4 +170,4 @@ explicitly setting the encoding to EUC-JP on the parser:
 
 ## License
 
-MIT. See the `LICENSE.txt` file.
+MIT. See the `LICENSE.md` file.

data/Rakefile

@@ -125,25 +125,29 @@ HOE = Hoe.spec 'nokogiri' do
 
   unless java?
     self.extra_deps += [
-      ["mini_portile2",    "~> 2.1.0"], # keep version in sync with extconf.rb
+      ["mini_portile2",    "~> 2.2.0"], # keep version in sync with extconf.rb
     ]
   end
 
   self.extra_dev_deps += [
     ["hoe-bundler",        "~> 1.2.0"],
-    ["hoe-debugging",      "~> 1.2.1"],
+    ["hoe-debugging",      "~> 1.3.0"],
     ["hoe-gemspec",        "~> 1.0.0"],
     ["hoe-git",            "~> 1.6.0"],
     ["minitest",           "~> 5.8.4"],
-    ["rake",               "~> 10.5.0"],
-    ["rake-compiler",      "~> 0.9.2"],
-    ["rake-compiler-dock", "~> 0.5.1"],
+    ["rake",               "~> 12.0"],
+    ["rake-compiler",      "~> 1.0.3"],
+    ["rake-compiler-dock", "~> 0.6.0"],
     ["racc",               "~> 1.4.14"],
-    ["rexical",            "~> 1.0.5"]
+    ["rexical",            "~> 1.0.5"],
+    ["concourse",          "~> 0.11"],
   ]
 
   if java?
-    self.spec_extras = { :platform => 'java' }
+    self.spec_extras = {
+        :platform => 'java',
+        :required_ruby_version => '>= 1.9.3' # JRuby >= 1.7
+    }
   else
     self.spec_extras = {
       :extensions => ["ext/nokogiri/extconf.rb"],
@@ -230,11 +234,6 @@ else
       ext.cross_compiling do |spec|
         libs = dependencies.map { |name, dep| "#{name}-#{dep["version"]}" }.join(', ')
 
-        spec.required_ruby_version = [
-          '>= 2.1.0',
-          "< #{CROSS_RUBIES.max_by(&:ver).minor_ver.succ}"
-        ]
-
         spec.post_install_message = <<-EOS
 Nokogiri is built with the packaged libraries: #{libs}.
         EOS
@@ -259,7 +258,7 @@ task 'bundler:gemfile' do
   old_gemfile_task.invoke if old_gemfile_task
 
   lines = File.open('Gemfile', 'r') { |f| f.readlines }.map do |line|
-    line =~ /racc|rexical/ ? "#{line.strip}, :platform => :ruby" : line
+    line =~ /racc|rexical/ ? "#{line.strip}, :platform => [:ruby, :mingw, :x64_mingw]" : line
   end
   File.open('Gemfile', 'w') { |f| lines.each { |line| f.puts line } }
 end
@@ -314,23 +313,8 @@ if Hoe.plugins.include?(:debugging)
   end
 end
 
-task "test:libxml-ruby" do
-  ENV['TEST_NOKOGIRI_WITH_LIBXML_RUBY'] = "1"
-  warn "#{__FILE__}:#{__LINE__}: --- running tests with libxml-ruby loaded ---"
-  Rake::Task[:test].execute
-  ENV['TEST_NOKOGIRI_WITH_LIBXML_RUBY'] = nil
-end
-
-Rake::Task["test:libxml-ruby"].prerequisites << :compile
-
-task "test:valgrind:libxml-ruby" do
-  ENV['TEST_NOKOGIRI_WITH_LIBXML_RUBY'] = "1"
-  warn "#{__FILE__}:#{__LINE__}: --- running tests with libxml-ruby loaded ---"
-  Rake::Task["test:valgrind"].execute
-  ENV['TEST_NOKOGIRI_WITH_LIBXML_RUBY'] = nil
-end
-
-Rake::Task["test:valgrind:libxml-ruby"].prerequisites << :compile
+require 'concourse'
+Concourse.new("nokogiri").create_tasks!
 
 # ----------------------------------------
 
@@ -352,7 +336,7 @@ end
 task :cross do
   rake_compiler_config_path = File.expand_path("~/.rake-compiler/config.yml")
   unless File.exists? rake_compiler_config_path
-    raise "rake-compiler has not installed any cross rubies. Try using rake-compiler-dev-box for building binary windows gems.'"
+    raise "rake-compiler has not installed any cross rubies. Use rake-compiler-dock or 'rake gem:windows' for building binary windows gems."
   end
 
   CROSS_RUBIES.each do |cross_ruby|

data/appveyor.yml

@@ -13,6 +13,8 @@ test_script:
 
 environment:
   matrix:
+    - ruby_version: "23"
+    - ruby_version: "23-x64"
     - ruby_version: "22"
     - ruby_version: "22-x64"
     - ruby_version: "21"

data/dependencies.yml

@@ -1,6 +1,6 @@
 libxml2:
   version: "2.9.4"
-  md5: "ae249165c173b1ff386ee8ad676815f5" # manually confirmed via `gpg --verify`
+  sha256: "ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c" # manually confirmed via `gpg --verify`
   # gpg: Signature made Mon 23 May 2016 04:02:13 AM EDT using DSA key ID DE95BC1F
   # gpg: Good signature from "Daniel Veillard (Red Hat work email) <veillard@redhat.com>"
   # gpg:                 aka "Daniel Veillard <Daniel.Veillard@w3.org>"
@@ -10,7 +10,7 @@ libxml2:
 
 libxslt:
   version: "1.1.29"
-  md5: "a129d3c44c022de3b9dcf6d6f288d72e"
+  sha256: "b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce"
   # gpg: Signature made Mon 23 May 2016 09:58:52 PM EDT using DSA key ID DE95BC1F
   # gpg: Good signature from "Daniel Veillard (Red Hat work email) <veillard@redhat.com>"
   # gpg:                 aka "Daniel Veillard <Daniel.Veillard@w3.org>"
@@ -20,10 +20,15 @@ libxslt:
 
 zlib:
   version: "1.2.11"
-  md5: "1c9f62f0778697a09d36121ead88e08e"
+  sha256: "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1"
+  # SHA-256 hash provided on http://zlib.net/
 
 libiconv:
-  version: "1.14"
-  md5: "e34509b1623cec449dfeb73d7ce9c6c6"
-  # gpg: Signature made Sun 07 Aug 2011 01:58:18 PM EDT using DSA key ID F059B1D1
-  # gpg: BAD signature from "Bruno Haible (Open Source Development) <bruno@clisp.org>"
+  version: "1.15"
+  sha256: "ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178"
+  # gpg: Signature made Fri Feb  3 00:38:12 2017 CET
+  # gpg:                using RSA key 4F494A942E4616C2
+  # gpg: Good signature from "Bruno Haible (Open Source Development) <bruno@clisp.org>" [unknown]
+  # gpg: WARNING: This key is not certified with a trusted signature!
+  # gpg:          There is no indication that the signature belongs to the owner.
+  # Primary key fingerprint: 68D9 4D8A AEEA D48A E7DC  5B90 4F49 4A94 2E46 16C2

data/ext/java/nokogiri/HtmlDocument.java

@@ -72,13 +72,13 @@ public class HtmlDocument extends XmlDocument {
     @JRubyMethod(name="new", meta = true, rest = true, required=0)
     public static IRubyObject rbNew(ThreadContext context, IRubyObject klazz,
                                     IRubyObject[] args) {
-        HtmlDocument htmlDocument = null;
+        HtmlDocument htmlDocument;
         try {
             Document docNode = createNewDocument();
             htmlDocument = (HtmlDocument) NokogiriService.HTML_DOCUMENT_ALLOCATOR.allocate(context.getRuntime(), (RubyClass) klazz);
             htmlDocument.setDocumentNode(context, docNode);
         } catch (Exception ex) {
-            throw context.getRuntime().newRuntimeError("couldn't create document: "+ex.toString());
+            throw context.getRuntime().newRuntimeError("couldn't create document: " + ex);
         }
 
         RuntimeHelpers.invoke(context, htmlDocument, "initialize", args);

data/ext/java/nokogiri/HtmlSaxParserContext.java

@@ -38,6 +38,7 @@ import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.nio.charset.Charset;
 import java.nio.charset.IllegalCharsetNameException;
+import java.nio.charset.UnsupportedCharsetException;
 import java.util.EnumSet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -46,10 +47,7 @@ import nokogiri.internals.NokogiriHandler;
 
 import org.apache.xerces.parsers.AbstractSAXParser;
 import org.cyberneko.html.parsers.SAXParser;
-import org.jruby.Ruby;
-import org.jruby.RubyClass;
-import org.jruby.RubyFixnum;
-import org.jruby.RubyString;
+import org.jruby.*;
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.runtime.ThreadContext;
@@ -104,7 +102,7 @@ public class HtmlSaxParserContext extends XmlSaxParserContext {
         return ctx;
     }
     
-    public static enum EncodingType {
+    public enum EncodingType {
         NONE(0, "NONE"),
         UTF_8(1, "UTF-8"),
         UTF16LE(2, "UTF16LE"),
@@ -131,6 +129,7 @@ public class HtmlSaxParserContext extends XmlSaxParserContext {
         
         private final int value;
         private final String name;
+
         EncodingType(int value, String name) {
             this.value = value;
             this.name = name;
@@ -145,9 +144,8 @@ public class HtmlSaxParserContext extends XmlSaxParserContext {
         }
     }
     
-    private static String findName(int value) {
-        EnumSet<EncodingType> set = EnumSet.allOf(EncodingType.class);
-        for (EncodingType type : set) {
+    private static String findName(final int value) {
+        for (EncodingType type : EncodingType.values()) {
             if (type.getValue() == value) return type.toString();
         }
         return null;
@@ -157,30 +155,31 @@ public class HtmlSaxParserContext extends XmlSaxParserContext {
         String rubyEncoding = null;
         if (encoding instanceof RubyString) {
             rubyEncoding = rubyStringToString(encoding);
-        } else if (encoding instanceof RubyFixnum) {
-            int value = (Integer)encoding.toJava(Integer.class);
+        }
+        else if (encoding instanceof RubyFixnum) {
+            int value = RubyFixnum.fix2int((RubyFixnum) encoding);
             rubyEncoding = findName(value);
         }
         if (rubyEncoding == null) return null;
         try {
-            Charset charset = Charset.forName(rubyEncoding);
-            return charset.displayName();
-        } catch (IllegalCharsetNameException e) {
-            throw context.getRuntime().newEncodingCompatibilityError(
-                    rubyEncoding + "is not supported in Java.");
-        } catch (IllegalArgumentException e) {
-            throw context.getRuntime().newInvalidEncoding(
-                    "encoding should not be nil");
+            return Charset.forName(rubyEncoding).displayName();
+        }
+        catch (UnsupportedCharsetException e) {
+            throw context.getRuntime().newEncodingCompatibilityError(rubyEncoding + "is not supported");
+        }
+        catch (IllegalCharsetNameException e) {
+            throw context.getRuntime().newInvalidEncoding(e.getMessage());
         }
     }
-    
+
+    private static final Pattern CHARSET_PATTERN = Pattern.compile("charset(()|\\s)=(()|\\s)([a-z]|-|_|\\d)+");
+
     private static String applyEncoding(String input, String enc) {
         String str = input.toLowerCase();
         int start_pos = 0;
         int end_pos = 0;
         if (input.contains("meta") && input.contains("charset")) {
-            Pattern p = Pattern.compile("charset(()|\\s)=(()|\\s)([a-z]|-|_|\\d)+");
-            Matcher m = p.matcher(str);
+            Matcher m = CHARSET_PATTERN.matcher(str);
             while (m.find()) {
                 start_pos = m.start();
                 end_pos = m.end();

data/ext/java/nokogiri/HtmlSaxPushParser.java

@@ -50,6 +50,7 @@ import java.util.concurrent.ThreadFactory;
 
 import nokogiri.internals.ClosedStreamException;
 import nokogiri.internals.NokogiriBlockingQueueInputStream;
+import nokogiri.internals.NokogiriHelpers;
 import nokogiri.internals.ParserContext;
 
 import org.jruby.Ruby;
@@ -133,18 +134,13 @@ public class HtmlSaxPushParser extends RubyObject {
         } catch (IOException e) {
             throw context.getRuntime().newRuntimeError(e.getMessage());
         }
-        byte[] data = null;
-        if (chunk instanceof RubyString || chunk.respondsTo("to_str")) {
-            data = chunk.convertToString().getBytes();
-        } else {
+        final ByteArrayInputStream data = NokogiriHelpers.stringBytesToStream(chunk);
+        if (data == null) {
             terminateTask(context);
-            XmlSyntaxError xmlSyntaxError =
-                (XmlSyntaxError) NokogiriService.XML_SYNTAXERROR_ALLOCATOR.allocate(context.getRuntime(), getNokogiriClass(context.getRuntime(), "Nokogiri::HTML::SyntaxError"));
-            throw new RaiseException(xmlSyntaxError);
+            throw new RaiseException(XmlSyntaxError.createHTMLSyntaxError(context.runtime)); // Nokogiri::HTML::SyntaxError
         }
 
-        int errorCount0 = parserTask.getErrorCount();;
-
+        int errorCount0 = parserTask.getErrorCount();
 
         if (isLast.isTrue()) {
             IRubyObject document = invoke(context, this, "document");
@@ -152,7 +148,7 @@ public class HtmlSaxPushParser extends RubyObject {
             terminateTask(context);
         } else {
             try {
-              Future<Void> task = stream.addChunk(new ByteArrayInputStream(data));
+              Future<Void> task = stream.addChunk(data);
               task.get();
             } catch (ClosedStreamException ex) {
               // this means the stream is closed, ignore this exception

data/ext/java/nokogiri/NokogiriService.java

@@ -72,8 +72,6 @@ public class NokogiriService implements BasicLibraryService {
         MonkeyPatchHTMLElements.patchIt();
     }
 
-    public static final String nokogiriClassCacheGvarName = "$NOKOGIRI_CLASS_CACHE";
-
     public boolean basicLoad(Ruby ruby) {
         init(ruby);
         return true;
@@ -84,7 +82,7 @@ public class NokogiriService implements BasicLibraryService {
     }
 
     private static Map<String, RubyClass> populateNokogiriClassCahce(Ruby ruby) {
-        Map<String, RubyClass> nokogiriClassCache = Collections.synchronizedMap(new HashMap<String, RubyClass>());
+        Map<String, RubyClass> nokogiriClassCache = new HashMap<String, RubyClass>();
         nokogiriClassCache.put("Nokogiri::EncodingHandler", (RubyClass)ruby.getClassFromPath("Nokogiri::EncodingHandler"));
         nokogiriClassCache.put("Nokogiri::HTML::Document", (RubyClass)ruby.getClassFromPath("Nokogiri::HTML::Document"));
         nokogiriClassCache.put("Nokogiri::HTML::ElementDescription", (RubyClass)ruby.getClassFromPath("Nokogiri::HTML::ElementDescription"));
@@ -111,8 +109,7 @@ public class NokogiriService implements BasicLibraryService {
         nokogiriClassCache.put("Nokogiri::XML::XPathContext", (RubyClass)ruby.getClassFromPath("Nokogiri::XML::XPathContext"));
         nokogiriClassCache.put("Nokogiri::XML::AttributeDecl", (RubyClass)ruby.getClassFromPath("Nokogiri::XML::AttributeDecl"));
         nokogiriClassCache.put("Nokogiri::XML::SAX::ParserContext", (RubyClass)ruby.getClassFromPath("Nokogiri::XML::SAX::ParserContext"));
-        nokogiriClassCache.put("StringIO", (RubyClass)ruby.getClassFromPath("StringIO"));
-        return nokogiriClassCache;
+        return Collections.unmodifiableMap(nokogiriClassCache);
     }
 
     private void init(Ruby ruby) {
@@ -139,7 +136,7 @@ public class NokogiriService implements BasicLibraryService {
         nokogiri.defineConstant("NEKO_VERSION", ruby.newString(org.cyberneko.html.Version.getVersion()));
     }
 
-    private void createNokogiriModule(Ruby ruby, RubyModule nokogiri) {;
+    private void createNokogiriModule(Ruby ruby, RubyModule nokogiri) {
         RubyClass encHandler = nokogiri.defineClassUnder("EncodingHandler", ruby.getObject(), ENCODING_HANDLER_ALLOCATOR);
         encHandler.defineAnnotatedMethods(EncodingHandler.class);
     }
@@ -471,9 +468,7 @@ public class NokogiriService implements BasicLibraryService {
                 clone.setMetaClass(klazz);
                 return clone;
             } catch (CloneNotSupportedException e) {
-                xmlNodeSet = new XmlNodeSet(runtime, klazz);
-                xmlNodeSet.setNodes(RubyArray.newEmptyArray(runtime));
-                return xmlNodeSet;
+                return new XmlNodeSet(runtime, klazz);
             }
         }
     };
@@ -553,13 +548,13 @@ public class NokogiriService implements BasicLibraryService {
         }
     };
 
-    private static ObjectAllocator XML_SAXPUSHPARSER_ALLOCATOR = new ObjectAllocator() {
+    private static final ObjectAllocator XML_SAXPUSHPARSER_ALLOCATOR = new ObjectAllocator() {
         public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
             return new XmlSaxPushParser(runtime, klazz);
         }
     };
-    
-    private static ObjectAllocator HTML_SAXPUSHPARSER_ALLOCATOR = new ObjectAllocator() {
+
+    private static final ObjectAllocator HTML_SAXPUSHPARSER_ALLOCATOR = new ObjectAllocator() {
         public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
             return new HtmlSaxPushParser(runtime, klazz);
         }
@@ -580,16 +575,8 @@ public class NokogiriService implements BasicLibraryService {
     };
 
     public static final ObjectAllocator XML_SYNTAXERROR_ALLOCATOR = new ObjectAllocator() {
-        private XmlSyntaxError xmlSyntaxError = null;
         public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-            if (xmlSyntaxError == null) xmlSyntaxError = new XmlSyntaxError(runtime, klazz);
-            try {
-                XmlSyntaxError clone  = (XmlSyntaxError) xmlSyntaxError.clone();
-                clone.setMetaClass(klazz);
-                return clone;
-            } catch (CloneNotSupportedException e) {
-                return new XmlSyntaxError(runtime, klazz);
-            }
+            return new XmlSyntaxError(runtime, klazz);
         }
     };
 
@@ -607,17 +594,9 @@ public class NokogiriService implements BasicLibraryService {
         }
     };
 
-    public static ObjectAllocator XML_XPATHCONTEXT_ALLOCATOR = new ObjectAllocator() {
-        private XmlXpathContext xmlXpathContext = null;
+    public static final ObjectAllocator XML_XPATHCONTEXT_ALLOCATOR = new ObjectAllocator() {
         public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-            if (xmlXpathContext == null) xmlXpathContext = new XmlXpathContext(runtime, klazz);
-            try {
-                XmlXpathContext clone  = (XmlXpathContext) xmlXpathContext.clone();
-                clone.setMetaClass(klazz);
-                return clone;
-            } catch (CloneNotSupportedException e) {
-                return new XmlXpathContext(runtime, klazz);
-            }
+            return new XmlXpathContext(runtime, klazz);
         }
     };