Merge branches 'ignite-789' and 'ignite-sprint-4'.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cda5bae8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cda5bae8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cda5bae8 Branch: refs/heads/ignite-286 Commit: cda5bae83e85e68f99843eab1a5fa0fab71123f8 Parents: 92794c5 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Tue Apr 28 15:44:13 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Tue Apr 28 15:44:13 2015 +0700 ---------------------------------------------------------------------- .../core/src/main/java/org/apache/ignite/Ignition.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cda5bae8/modules/core/src/main/java/org/apache/ignite/Ignition.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/Ignition.java b/modules/core/src/main/java/org/apache/ignite/Ignition.java index 0204f4c..47f3665 100644 --- a/modules/core/src/main/java/org/apache/ignite/Ignition.java +++ b/modules/core/src/main/java/org/apache/ignite/Ignition.java @@ -408,14 +408,14 @@ public class Ignition { * Loads Spring bean by its name from given Spring XML configuration file. If bean * with such name doesn't exist, exception is thrown. * - * @param springXmlCfg Spring XML configuration input stream (cannot be {@code null}). + * @param springXmlUrl Spring XML configuration file URL (cannot be {@code null}). * @param beanName Bean name (cannot be {@code null}). * @return Loaded bean instance. * @throws IgniteException If bean with provided name was not found or in case any other error. */ - public static <T> T loadSpringBean(InputStream springXmlCfg, String beanName) throws IgniteException { + public static <T> T loadSpringBean(URL springXmlUrl, String beanName) throws IgniteException { try { - return IgnitionEx.loadSpringBean(springXmlCfg, beanName); + return IgnitionEx.loadSpringBean(springXmlUrl, beanName); } catch (IgniteCheckedException e) { throw U.convertException(e); @@ -426,14 +426,14 @@ public class Ignition { * Loads Spring bean by its name from given Spring XML configuration file. If bean * with such name doesn't exist, exception is thrown. * - * @param springXmlUrl Spring XML configuration file URL (cannot be {@code null}). + * @param springXmlStream Input stream containing Spring XML configuration (cannot be {@code null}). * @param beanName Bean name (cannot be {@code null}). * @return Loaded bean instance. * @throws IgniteException If bean with provided name was not found or in case any other error. */ - public static <T> T loadSpringBean(URL springXmlUrl, String beanName) throws IgniteException { + public static <T> T loadSpringBean(InputStream springXmlStream, String beanName) throws IgniteException { try { - return IgnitionEx.loadSpringBean(springXmlUrl, beanName); + return IgnitionEx.loadSpringBean(springXmlStream, beanName); } catch (IgniteCheckedException e) { throw U.convertException(e);
