From 163d57530b5cddc5df72e6e5985224cccd9e2232 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 27 Jan 2020 10:55:54 +0100 Subject: [PATCH] Remove warnings. --- .../argeo/cms/internal/jcr/RepositoryBuilder.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/org.argeo.cms/src/org/argeo/cms/internal/jcr/RepositoryBuilder.java b/org.argeo.cms/src/org/argeo/cms/internal/jcr/RepositoryBuilder.java index 86ce94bb4..b3ab11a33 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/jcr/RepositoryBuilder.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/jcr/RepositoryBuilder.java @@ -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 properties) throws RepositoryException { + public RepositoryContext createRepositoryContext(Dictionary 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 properties) throws RepositoryException { + RepositoryConfig createRepositoryConfig(Dictionary 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); } } -- 2.30.2