/[Apache-SVN]
ViewVC logotype

Revision 321274


Jump to revision: Previous Next
Author: kmarsden
Date: Sat Oct 15 01:22:15 2005 UTC (4 years, 1 month ago)
Changed paths: 7
Log Message:
DERBY-375

Specification of incomplete server properties on command line causes NPE with NetworkServerControl when starting the server.

The patch does the following:
1. Moves the call to 'init', which initializes 'langUtil', before the call to 'getPropertyInfo' method in the constructors of NetworkServerControlImpl.
2. If the system properties are specified without values, use defaults for them.
3. For 'derby.drda.traceDirectory' property following is mentioned in the doc - "If the derby.system.home property has been set, it is the default. Otherwise, the default is the current directory.". 'getPropertyInfo' was getting the value of 'derby.system.home' but not using it as default for 'derby.drda.traceDirectory'.
So the current directory was always getting used as default. Changed this.
4. When I added the default for 'derby.drda.traceDirectory', the tests derbynet/getCurrentProperties.java and derbynet/sysinfo.java had additional lines for derby.drda.traceDirectory in their outputs. Since the directory listed is dependent on the test directory, I have sed out 'traceDirectory' lines for these tests.
5. Adds tests to derbynet/testProperties.java.
6. Fixes javadoc for 'traceDirectory' in NetworkServerControl.

Contributed by Deepa Remesh


Changed paths:

Path Details
Directorydb/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java modified , text changed
Directorydb/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java modified , text changed
Directorydb/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out modified , text changed
Directorydb/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/copyfiles.ant modified , text changed
Directorydb/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/getCurrentProperties_sed.properties added
Directorydb/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/sysinfo_sed.properties modified , text changed
Directorydb/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties.java modified , text changed

apache@apache.org
ViewVC Help
Powered by ViewVC 1.1.2