svn commit: r158045 - cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/impl/CopletLayout.java

[cziegeler]

Author: cziegeler
Date: Fri Mar 18 01:33:36 2005
New Revision: 158045

URL: http://svn.apache.org/viewcvs?view=rev&rev=158045
Log:
Bugfix: the layout id shouldn't be changed if available

Modified:
    
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/impl/CopletLayout.java

Modified: 
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/impl/CopletLayout.java
URL: 
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/impl/CopletLayout.java?view=diff&r1=158044&r2=158045
==============================================================================
--- 
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/impl/CopletLayout.java
 (original)
+++ 
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/impl/CopletLayout.java
 Fri Mar 18 01:33:36 2005
@@ -34,8 +34,7 @@
     
     public void setCopletInstanceData(CopletInstanceData cid) {
         this.copletInstanceData = cid;
-        String id = cid.getId();
-        if (id != null) {
+        if ( this.getId() == null ) {
             this.setId(cid.getId());
         }
     }