Hi,
I have uploaded a second patch for derby-205 to clean up a
redundancy as per Kathey's suggestion. I have done the following:
- Removed the (redundant) reading of these stream name properties from
NetworkServerControlImpl.java:
derby.stream.error.file
derby.stream.error.method
derby.stream.error.field
- Modified DRDAConnThread.java to get the stream name via
Monitor.getStream().getName (a new method). DRDAConnThread was the
sole client and reason for the redundancy Kathey spotted.
- Augmented HeaderPrintWriter interface with a new method, getName.
- Augmented BasicHeaderPrintWriter to hold the stream name of the
error log.
- Moved hard coded constants for the stream name attributes from
SingleStream.java to the Property interface and documented them there.
- Removed the errorLogLocation field and the getErrorLogLocation from
NetworkServerControlImpl.java
- Cleaned up some Javadoc for the items I touched.
I have run derbyall with JDK1.4.2 on Solaris/x86. derbyall runs with
errors, but the same errors are present on a clean checkout as well
(parameterMapping, backupRestore1). Hope somebody cleans that up...
I could not see that the tests tested either the ".method" or the
".field" propeties in any way, and thus not the precedence relation
between them either. It could be a good idea to add tests for that,
perhaps.
I also built the Javadoc to check my doc changes.
Dag
----------------------------------------205b.stat
M
java/engine/org/apache/derby/impl/services/stream/BasicHeaderPrintWriter.java
M java/engine/org/apache/derby/impl/services/stream/SingleStream.java
M java/engine/org/apache/derby/iapi/services/stream/HeaderPrintWriter.java
M java/engine/org/apache/derby/iapi/reference/Property.java
M java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
M java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
