evenisse 2003/08/26 02:52:08
Modified: src/java/org/apache/maven/project BaseObject.java
src/test/java/org/apache/maven/project BaseObjectTest.java
Log:
Fix for MAVEN-701. Empty id is equivalent to null id.
Revision Changes Path
1.27 +2 -2 maven/src/java/org/apache/maven/project/BaseObject.java
Index: BaseObject.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/project/BaseObject.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- BaseObject.java 19 Aug 2003 04:29:25 -0000 1.26
+++ BaseObject.java 26 Aug 2003 09:52:08 -0000 1.27
@@ -134,7 +134,7 @@
*/
public String getId()
{
- if ( id == null )
+ if ( id == null || id.equals(""))
{
id = Integer.toString( uniqueId++ );
}
1.4 +1 -1 maven/src/test/java/org/apache/maven/project/BaseObjectTest.java
Index: BaseObjectTest.java
===================================================================
RCS file:
/home/cvs/maven/src/test/java/org/apache/maven/project/BaseObjectTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BaseObjectTest.java 19 Aug 2003 04:45:37 -0000 1.3
+++ BaseObjectTest.java 26 Aug 2003 09:52:08 -0000 1.4
@@ -68,7 +68,7 @@
public void testSetGetId() throws Exception
{
// JUnitDoclet begin method setId getId
- java.lang.String[] tests = {"", " ", "a", "A", "�", "�", "0123456789",
"012345678901234567890", "\n"};
+ java.lang.String[] tests = {" ", "a", "A", "�", "�", "0123456789",
"012345678901234567890", "\n"};
for ( int i = 0; i < tests.length; i++ )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
