[RIVER-211] source files for ServiceItem, ServiceMatches, and ServiceTemplate do not match binary distribution

• Type: Bug
• Status: Closed
• Priority: Minor
• Resolution: Won't Fix
• Affects Version/s: jtsk_2.1
• Fix Version/s: River_2.1.1
• Component/s: build
• Bugtraq ID: 6340076
• Assignee: Frank Barnaby
• Reporter: Juan Ramirez
• Created: 10/Aug/07 18:33
• Updated: 21/Nov/07 01:57
• Resolved: 21/Nov/07 01:57

Description

6340076

The source files for ServiceItem, ServiceMatches, and ServiceTemplate included with the Porter GA release of the starter kit are the Porter Beta 2 versions. The binary distribution of these classes in jsk-platform.jar and jini-core.jar is the correct Porter GA version. The source files are out of date relative to the binaries. The Porter Beta 2 versions contain a bug in their toString() implementations (CRs 6326824, 6326851, 6326855)

Diffs between GA and Beta 2 vesions; GA version appears first:

ServiceItem.java:

81,87c81,83
< sBuffer.append("[");
< if (attributeSets.length > 0)

{ < for (int i = 0; i < attributeSets.length - 1; i++) < sBuffer.append(attributeSets[i]).append(" "); < sBuffer.append(attributeSets[attributeSets.length - 1]); < }

< sBuffer.append("]");
—
> for (int i = 0; i < attributeSets.length - 1; i++)
> sBuffer.append(attributeSets[i]).append(" ");
> sBuffer.append(attributeSets[attributeSets.length - 1]);

ServiceMatches.java:

70,76c70,72
< sBuffer.append("[");
< if (items.length > 0)

{ < for (int i = 0; items.length > 0 && i < items.length - 1; i++) < sBuffer.append(items[i]).append(" "); < sBuffer.append(items[items.length - 1]); < }

< sBuffer.append("]");
—
> for (int i = 0; i < items.length - 1; i++)
> sBuffer.append(items[i]).append(" ");
> sBuffer.append(items[items.length - 1]);

ServiceTemplate.java:

94,100c94,96
< sBuffer.append("[");
< if (serviceTypes.length > 0)

{ < for (int i = 0; i < serviceTypes.length - 1; i++) < sBuffer.append(serviceTypes[i]).append(" "); < sBuffer.append(serviceTypes[serviceTypes.length - 1]); < }

< sBuffer.append("]");
—
> for (int i = 0; i < serviceTypes.length - 1; i++)
> sBuffer.append(serviceTypes[i]).append(" ");
> sBuffer.append(serviceTypes[serviceTypes.length - 1]);
106,113c102,105
< sBuffer.append("[");
< if (attributeSetTemplates.length > 0)

{ < for (int i = 0; i < attributeSetTemplates.length - 1; i++) < sBuffer.append(attributeSetTemplates[i]).append(" "); < sBuffer.append( < attributeSetTemplates[attributeSetTemplates.length - 1]); < }

< sBuffer.append("]");
—
> for (int i = 0; i < attributeSetTemplates.length - 1; i++)
> sBuffer.append(attributeSetTemplates[i]).append(" ");
> sBuffer.append(
> attributeSetTemplates[attributeSetTemplates.length - 1]);

There is actually nothing to fix here. The files were out of sync because
the manually modified final 2.1 build did not include the source files that
matched the binary changes. I confirmed that the build does indeed include
the correct source files.