Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Disable logging during brokerfactory de-serialization. Added type checking of plugin values. 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/1.1.x@1462512 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jeremy Bauer 2013-03-29 15:57:37 +00:00
parent 9442bc39fe
commit 521fecd2d9
3 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java
View File

@ -467,7 +467,13 @@ public abstract class AbstractBrokerFactory
_transactional = new ConcurrentHashMap(); _transactional = new ConcurrentHashMap();
_brokers = newBrokerSet(); _brokers = newBrokerSet();
// turn off logging while de-serializing BrokerFactory
String saveLogConfig = _conf.getLog();
_conf.setLog("none");
makeReadOnly(); makeReadOnly();
// re-enable any logging which was in effect
_conf.setLog(saveLogConfig);
return this; return this;
} }

24
openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/PluginValue.java
View File

@ -19,7 +19,9 @@
package org.apache.openjpa.lib.conf; package org.apache.openjpa.lib.conf;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.openjpa.lib.log.Log;
import org.apache.openjpa.lib.util.Localizer; import org.apache.openjpa.lib.util.Localizer;
import org.apache.openjpa.lib.util.ParseException;
/** /**
* A plugin {@link Value} consisting of plugin name and properties. * A plugin {@link Value} consisting of plugin name and properties.
@ -100,6 +102,20 @@ public class PluginValue extends ObjectValue {
*/ */
public Object instantiate(Class type, Configuration conf, boolean fatal) { public Object instantiate(Class type, Configuration conf, boolean fatal) {
Object obj = newInstance(_name, type, conf, fatal); Object obj = newInstance(_name, type, conf, fatal);
// ensure plugin value is compatible with plugin type
if (obj != null && !type.isAssignableFrom(obj.getClass())) {
Log log = (conf == null) ? null : conf.getConfigurationLog();
String msg = getIncompatiblePluginMessage(obj, type);
if (log != null && log.isErrorEnabled()) {
log.error(msg);
}
if (fatal) {
throw new ParseException(msg);
}
return null;
}
Configurations.configureInstance(obj, conf, _props, Configurations.configureInstance(obj, conf, _props,
(fatal) ? getProperty() : null); (fatal) ? getProperty() : null);
if (_singleton) if (_singleton)
@ -107,6 +123,14 @@ public class PluginValue extends ObjectValue {
return obj; return obj;
} }
private String getIncompatiblePluginMessage(Object obj, Class<?> type) {
return _loc.get("incompatible-plugin",
new Object[]{ _name,
obj == null ? null : obj.getClass().getName(),
type == null ? null : type.getName()
}).toString();
}
public void set(Object obj, boolean derived) { public void set(Object obj, boolean derived) {
if (!_singleton) if (!_singleton)
throw new IllegalStateException(_loc.get("not-singleton", throw new IllegalStateException(_loc.get("not-singleton",

3
openjpa-lib/src/main/resources/org/apache/openjpa/lib/conf/localizer.properties
View File

@ -114,3 +114,6 @@ Id-expert: true
veto-change: Can not modify "{0}" because the property is not dynamic and the \ veto-change: Can not modify "{0}" because the property is not dynamic and the \
current configuration is read-only. current configuration is read-only.
incompatible-plugin: The plugin "{0}" of value type "{1}" is not compatible with \
the expected plugin type "{2}". Update the configuration property with a value that \
is compatible with the plugin.