On Oct 11, 2006, at 1:21 AM, Jacek Laskowski wrote:
On 10/10/06, [EMAIL PROTECTED] <[EMAIL PROTECTED]> wrote:
Author: djencks
Date: Tue Oct 10 14:36:45 2006
New Revision: 462587
URL: http://svn.apache.org/viewvc?view=rev&rev=462587
Log:
GERONIMO-2383 Forgot the isMergeEnvironment in a couple builders.
Give client builder its own ref builders
...
+ protected boolean willMergeEnvironment(XmlObject specDD,
XmlObject plan) {
+ return specDD.selectChildren
(adminOjbectRefQNameSet).length > 0 || specDD.selectChildren
(messageDestinationRefQNameSet).length > 0;
+ }
...
+ protected boolean willMergeEnvironment(XmlObject specDD,
XmlObject plan) {
+ return specDD.selectChildren(resourceRefQNameSet).length
> 0;
+ }
+
I'm kind of confused. You wrote isMergeEnvironment in the commit log
whereas the method name starts with 'will'. I think you were right in
your commit log as it tests not does something.
The patch is right, this is a protected method in
AbstractNamingBuilder, and depending on the answer we proceed to
merge environments or not.
The method name might not be ideal, but changing it would be a much
bigger patch.
thanks
david jencks
Jacek
--
Jacek Laskowski
http://www.laskowski.net.pl
