Remove warnings.
authorMathieu Baudier <mbaudier@argeo.org>
Mon, 27 Jan 2020 09:55:54 +0000 (10:55 +0100)
committerMathieu Baudier <mbaudier@argeo.org>
Mon, 27 Jan 2020 09:55:54 +0000 (10:55 +0100)
org.argeo.cms/src/org/argeo/cms/internal/jcr/RepositoryBuilder.java

index 86ce94bb40884b47c493c1c12e7dfa184c2980f8..b3ab11a3357f0c4d0ff3e1c38590f511dc6919e1 100644 (file)
@@ -14,7 +14,6 @@ import java.util.UUID;
 
 import javax.jcr.RepositoryException;
 
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.core.RepositoryContext;
@@ -32,7 +31,8 @@ import org.xml.sax.InputSource;
 public class RepositoryBuilder {
        private final static Log log = LogFactory.getLog(RepositoryBuilder.class);
 
-       public RepositoryContext createRepositoryContext(Dictionary<String, ?> properties) throws RepositoryException {
+       public RepositoryContext createRepositoryContext(Dictionary<String, ?> properties)
+                       throws RepositoryException, IOException {
                RepositoryConfig repositoryConfig = createRepositoryConfig(properties);
                RepositoryContext repositoryContext = createJackrabbitRepository(repositoryConfig);
                RepositoryImpl repository = repositoryContext.getRepository();
@@ -49,22 +49,17 @@ public class RepositoryBuilder {
                return repositoryContext;
        }
 
-       RepositoryConfig createRepositoryConfig(Dictionary<String, ?> properties) throws RepositoryException {
+       RepositoryConfig createRepositoryConfig(Dictionary<String, ?> properties) throws RepositoryException, IOException {
                JackrabbitType type = JackrabbitType.valueOf(prop(properties, RepoConf.type).toString());
                ClassLoader cl = getClass().getClassLoader();
-               InputStream in = null;
-               try {
-                       final String base = "/org/argeo/cms/internal/jcr";
-                       in = cl.getResourceAsStream(base + "/repository-" + type.name() + ".xml");
-
+               final String base = "/org/argeo/cms/internal/jcr";
+               try (InputStream in = cl.getResourceAsStream(base + "/repository-" + type.name() + ".xml")) {
                        if (in == null)
                                throw new ArgeoJcrException("Repository configuration not found");
                        InputSource config = new InputSource(in);
                        Properties jackrabbitVars = getConfigurationProperties(type, properties);
                        RepositoryConfig repositoryConfig = RepositoryConfig.create(config, jackrabbitVars);
                        return repositoryConfig;
-               } finally {
-                       IOUtils.closeQuietly(in);
                }
        }