svn commit: r486239 - /incubator/wicket/trunk/wicket/src/main/java/wicket/Component.java

[ivaynberg]

Author: ivaynberg
Date: Tue Dec 12 09:09:16 2006
New Revision: 486239

URL: http://svn.apache.org/viewvc?view=rev&rev=486239
Log:
bring back the ability to use manually defined markup ids

Modified:
    incubator/wicket/trunk/wicket/src/main/java/wicket/Component.java

Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/Component.java
URL: 
http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/Component.java?view=diff&rev=486239&r1=486238&r2=486239
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/Component.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/Component.java Tue Dec 
12 09:09:16 2006
@@ -1073,7 +1073,7 @@
        {
                // first try a manually set id
                String markupId = 
getMarkupAttributes().getString(MARKUP_ID_ATTR_NAME);
-               if (id == null)
+               if (markupId == null)
                {
                        // then check the metadata
                        markupId = getMetaData(MARKUP_ID_KEY);