You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by pc...@apache.org on 2007/08/30 20:47:51 UTC
svn commit: r571274 -
/openjpa/branches/1.0.x/openjpa-kernel-5/src/main/java/org/apache/openjpa/enhance/PCEnhancerAgent.java
Author: pcl
Date: Thu Aug 30 11:47:50 2007
New Revision: 571274
URL: http://svn.apache.org/viewvc?rev=571274&view=rev
Log:
OPENJPA-346. 'svn merge -c 571269 ../../trunk'
Modified:
openjpa/branches/1.0.x/openjpa-kernel-5/src/main/java/org/apache/openjpa/enhance/PCEnhancerAgent.java
Modified: openjpa/branches/1.0.x/openjpa-kernel-5/src/main/java/org/apache/openjpa/enhance/PCEnhancerAgent.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-kernel-5/src/main/java/org/apache/openjpa/enhance/PCEnhancerAgent.java?rev=571274&r1=571273&r2=571274&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-kernel-5/src/main/java/org/apache/openjpa/enhance/PCEnhancerAgent.java (original)
+++ openjpa/branches/1.0.x/openjpa-kernel-5/src/main/java/org/apache/openjpa/enhance/PCEnhancerAgent.java Thu Aug 30 11:47:50 2007
@@ -60,14 +60,24 @@
public static void premain(String args, Instrumentation inst) {
Options opts = Configurations.parseProperties(args);
- if (opts.getBooleanProperty(
- "ClassLoadEnhancement", "classLoadEnhancement", true))
- registerClassLoadEnhancer(inst, opts);
-
- // Deprecated property setting
- if (opts.getBooleanProperty(
- "RuntimeEnhancement", "runtimeEnhancement", true))
+ if (opts.containsKey("ClassLoadEnhancement") ||
+ opts.containsKey("classLoadEnhancement")) {
+ if (opts.getBooleanProperty(
+ "ClassLoadEnhancement", "classLoadEnhancement", true))
+ registerClassLoadEnhancer(inst, opts);
+ }
+ else if (opts.containsKey("RuntimeEnhancement") ||
+ opts.containsKey("runtimeEnhancement")) {
+ // Deprecated property setting
+ if (opts.getBooleanProperty(
+ "RuntimeEnhancement", "runtimeEnhancement", true))
+ registerClassLoadEnhancer(inst, opts);
+ } else {
+ // if neither is set, then we should be turning it on. We need this
+ // logic instead of just a getBooleanProperty() because of the
+ // backwards-compat logic flow.
registerClassLoadEnhancer(inst, opts);
+ }
if (opts.getBooleanProperty(
"RuntimeRedefinition", "runtimeRedefinition", true)) {