You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by dj...@apache.org on 2006/03/14 20:18:39 UTC
svn commit: r385859 - in /db/derby/code/trunk/java:
engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
testing/org/apache/derbyTesting/functionTests/util/derby_tests.policy
Author: djd
Date: Tue Mar 14 11:18:37 2006
New Revision: 385859
URL: http://svn.apache.org/viewcvs?rev=385859&view=rev
Log:
DERBY-623 Change BaseMonitor to use privileged blocks for reading derby.debug.* system properties
and also removing the workaround permissions granted in 'derby_tests.policy'.
Modified:
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/derby_tests.policy
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java?rev=385859&r1=385858&r2=385859&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java Tue Mar 14 11:18:37 2006
@@ -352,8 +352,8 @@
addDebugFlags(applicationProperties.getProperty(Monitor.DEBUG_TRUE), true);
}
- addDebugFlags(System.getProperty(Monitor.DEBUG_FALSE), false);
- addDebugFlags(System.getProperty(Monitor.DEBUG_TRUE), true);
+ addDebugFlags(PropertyUtil.getSystemProperty(Monitor.DEBUG_FALSE), false);
+ addDebugFlags(PropertyUtil.getSystemProperty(Monitor.DEBUG_TRUE), true);
}
try {
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/derby_tests.policy
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/derby_tests.policy?rev=385859&r1=385858&r2=385859&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/derby_tests.policy (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/derby_tests.policy Tue Mar 14 11:18:37 2006
@@ -82,10 +82,6 @@
// BUG DERBY-622 derbynet/sysinfo.java
permission java.io.FilePermission "${derbyTesting.codedir}${/}*", "read";
- // BUG DERBY-623 - sane=true
- permission java.util.PropertyPermission "derby.monitor.verbose", "read";
- permission java.util.PropertyPermission "derby.debug.*", "read";
-
// sane=true, jdbcapi/secureUsers1.sql
permission java.io.FilePermission "${user.dir}${/}CloudLDAP.out", "write";