svn commit: r1748619 - /aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/NamespaceHandlerRegistryImpl.java

[jw...@apache.org]

Author: jwross
Date: Wed Jun 15 19:09:55 2016
New Revision: 1748619

URL: http://svn.apache.org/viewvc?rev=1748619&view=rev
Log:
[ARIES-1574] Remove the reference to AutoCloseable in blueprint-core in order to maintain Java 1.6 compatibility.

Modified:
    aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/NamespaceHandlerRegistryImpl.java

Modified: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/NamespaceHandlerRegistryImpl.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/NamespaceHandlerRegistryImpl.java?rev=1748619&r1=1748618&r2=1748619&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/NamespaceHandlerRegistryImpl.java (original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/namespace/NamespaceHandlerRegistryImpl.java Wed Jun 15 19:09:55 2016
@@ -18,6 +18,10 @@
  */
 package org.apache.aries.blueprint.namespace;
 
+import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI;
+import static javax.xml.XMLConstants.XML_NS_URI;
+import static org.apache.aries.blueprint.parser.Parser.BLUEPRINT_NAMESPACE;
+
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
@@ -44,6 +48,7 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CopyOnWriteArraySet;
+
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
@@ -63,10 +68,6 @@ import org.w3c.dom.ls.LSInput;
 import org.w3c.dom.ls.LSResourceResolver;
 import org.xml.sax.SAXException;
 
-import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI;
-import static javax.xml.XMLConstants.XML_NS_URI;
-import static org.apache.aries.blueprint.parser.Parser.BLUEPRINT_NAMESPACE;
-
 /**
  * Default implementation of the NamespaceHandlerRegistry.
  * 
@@ -461,7 +462,7 @@ public class NamespaceHandlerRegistryImp
             return schema;
         }
 
-        private class Loader implements LSResourceResolver, AutoCloseable {
+        private class Loader implements LSResourceResolver, Closeable {
             final List<StreamSource> sources = new ArrayList<StreamSource>();
             final Map<String, URL> loaded = new HashMap<String, URL>();
             final Map<String, String> namespaces = new HashMap<String, String>();