Author: seb Date: Wed Jan 17 17:18:56 2007 New Revision: 1244 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/BindDataSourceToJNDIAction.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/ParamAction.java Log: Updated classes that did not set the context when creating a PropertySetter object. Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/BindDataSourceToJNDIAction.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/BindDataSourceToJNDIAction.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/BindDataSourceToJNDIAction.java Wed Jan 17 17:18:56 2007 @@ -58,6 +58,7 @@ (DataSource) OptionHelper.instantiateByClassName(dsClassName, DataSource.class, context); PropertySetter setter = new PropertySetter(ds); + setter.setContext(context); if (!OptionHelper.isEmpty(urlStr)) { setter.setProperty("url", urlStr); Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/ParamAction.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/ParamAction.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/ParamAction.java Wed Jan 17 17:18:56 2007 @@ -45,6 +45,7 @@ Object o = ec.peekObject(); PropertySetter propSetter = new PropertySetter(o); + propSetter.setContext(context); value = ec.subst(value); // allow for variable substitution for name as well