From 9420bdc246dde4f8af629ab49342b47a141c4e83 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Wed, 5 Jan 2011 22:25:42 +0000 Subject: [PATCH] Document createEnvironment() methods in AbstractApplicationContext and SpringContextResourceAdapter --- .../context/support/AbstractApplicationContext.java | 2 ++ .../jca/context/SpringContextResourceAdapter.java | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/org.springframework.context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java b/org.springframework.context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java index 890772ec89..18eff91001 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java +++ b/org.springframework.context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java @@ -411,6 +411,8 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader /** * Create and return a new {@link DefaultEnvironment}. + *

Subclasses may override this method in order to supply + * a custom {@link ConfigurableEnvironment} implementation. */ protected ConfigurableEnvironment createEnvironment() { return new DefaultEnvironment(); diff --git a/org.springframework.transaction/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java b/org.springframework.transaction/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java index 3f6fd8bd79..48b46fe59f 100644 --- a/org.springframework.transaction/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java +++ b/org.springframework.transaction/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java @@ -144,10 +144,11 @@ public class SpringContextResourceAdapter implements ResourceAdapter { } /** - * Return + * Return a new {@link DefaultEnvironment}. + *

Subclasses may override this method in order to supply + * a custom {@link ConfigurableEnvironment} implementation. */ protected ConfigurableEnvironment createEnvironment() { - // TODO: should actually return return new DefaultEnvironment(); }